HHH-2188 Query metadata gives NPE for polymorphic queries
Conflicts:
	hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryImpl.java