Fix for MAGN-3178

The importer was pushing fields into sub-types, that were then conflicting with their super-type. This was result in a compile failure.

Added repro test
Merge branch 'master' of https://github.com/DynamoDS/Dynamo