Fixed issues with schema name collisions#5486

Merged

carltongibson merged 8 commits intoencode:masterfrom mlubimow:master---schema-naming-collision

Oct 16, 2017

+122-11

Commits on Oct 7, 2017

Fixed issues with schema name collisions
Marcin Lubimow
committed
Fixed mutating issues in python 3
Marcin Lubimow
committed

Commits on Oct 8, 2017

Optimized solution
Marcin Lubimow
committed
Fixed isort
Marcin Lubimow
committed
Removed not needed cast
Marcin Lubimow
committed

Commits on Oct 9, 2017

Fix for key collision
Marcin Lubimow
committed
Added preferred key to preserve if available
Marcin Lubimow
committed

Commits on Oct 12, 2017

Add accidently removed test
Marcin Lubimow
committed