HHH-8897 - Integrate org.hibernate.metamodel from metamodel branch into master