Consolidate two datatype models into one
Eliminate comying from one model to the other.
Handle multiple datatypes at the same map key
Add itest for conflicted datatypes at the same map key
Merge branch 'gh380-fix-datatype-maps' into develop