HHH-7042 Clean up & finish MetadataSources
HHH-8125 Support for pure native scalar queries in metamodel