HHH-8790 add "escape" keyword to Template
HHH-2298 WARN if using build-in conn pool
HHH-3051 corrected Loader returnTypes

Conflicts:
	hibernate-core/src/main/java/org/hibernate/loader/Loader.java
HHH-8790 added @Filter deduceAliasInjectionPoints info and examples to
user guide
HHH-3051 corrected CustomLoader returnTypes (different approach)

Conflicts:
	hibernate-core/src/main/java/org/hibernate/loader/Loader.java
	hibernate-core/src/main/java/org/hibernate/loader/custom/CustomLoader.java
HHH-3453 updated list of Dialects in docs
HHH-8699 - Multiselect with boolean predicate

Conflicts:
	hibernate-core/src/main/antlr/hql-sql.g
	hibernate-core/src/main/antlr/sql-gen.g
	hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/criteria/QueryBuilderTest.java
	hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/metamodel/Customer.java
HHH-8831 improved exception message

When having @JoinColumn in a @CollectionTable that do not point to valid columns, the message can be really confusing. These new lines will actually enrich the exception which is thrown that the problem appeared on a specific property of a specific class.

Please include this, since it is not always clear what the actual problem is with a mapping when an exception occurs.
HHH-8831 changed exception type, formatting
HHH-8638 global quoting breaks UC on FK
HHH-2188 Query metadata gives NPE for polymorphic queries
Conflicts:
	hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryImpl.java
HHH-5289 remove unnecessary security checks in property accessors
Conflicts:
	hibernate-core/src/main/java/org/hibernate/internal/util/ReflectHelper.java
	hibernate-entitymanager/src/main/java/org/hibernate/jpa/event/internal/jpa/CallbackProcessorImpl.java
	hibernate-entitymanager/src/main/java/org/hibernate/jpa/event/internal/jpa/LegacyCallbackProcessor.java
	hibernate-entitymanager/src/main/java/org/hibernate/jpa/internal/metamodel/MetadataContext.java
HHH-8863 correct StatisticalLoggingSessionEventListener partial flush
timing
HHH-8404: Correctly render 'ListIndexExpression'

Conflicts:
	hibernate-entitymanager/src/main/java/org/hibernate/jpa/criteria/expression/ListIndexExpression.java
HHH-8404 test case

Conflicts:
	hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/criteria/QueryBuilderTest.java
	hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/metamodel/Address.java
HHH-2988 Update UnionSubclassEntityPersister column quoting
HHH-2988 test case

Conflicts:
	hibernate-core/src/test/java/org/hibernate/test/quote/QuoteTest.java
HHH-8864 count distinct tuples for postgres and h2
Conflicts:
	hibernate-core/src/main/java/org/hibernate/dialect/PostgreSQL81Dialect.java
	hibernate-core/src/main/java/org/hibernate/dialect/function/StandardAnsiSqlAggregationFunctions.java
Completed implementation of Maven Enhance Plugin fixing issue with
missing descriptor files. Mojo will automatically hook into build
lifecycle compile phase.
Added documentation for build time enhancement instructions. Reconfigured script to use build time version number.