Merge branch '22-enumtype-must-not-use-a-different-id-if-it-is-identical-to-the-nsd-one' into 'master'

Resolve "EnumType must not use a different id if it is identical to the NSD one"

Closes #22

See merge request !22