Add map base types and MapAnnotation, see #11341
Add GenericSource using the Map type, see #11344
Add MapAnnotation to templates
Adding MapPairs class (from rleigh)
Merge in Xsd-Fu changes from develop and fix build