Added more data to be loaded for the MapEntryQueryServiceTestIT, and
added some TODOs for CommonResourceUtils regarding MappingExtension
restrictions.