HHH-9150 : Envers test table is too long causing Oracle failure
HHH-9171 : Orphan removal broken for new element added by merge that is removed by later merge (test case)
HHH-9174 Increase performance
of SqlExceptionHelper#handleAndClearWarnings
Conflicts:
	hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/SqlExceptionHelper.java
HHH-9170 StatelessSession is accidentally 2LC enabled in some cases
HHH-9174 cache SqlExceptionHelper reference
HHH-9154 : HQL Parsing: unexpected token ':' (test case)
HHH-9169 : SQLServer2012Dialect creates sequences starting from Long.MIN_VALUE
HHH-9169 : SQLServer2012Dialect creates sequences starting from Long.MIN_VALUE
HHH-9169 : SQLServer2012Dialect creates sequences starting from Long.MIN_VALUE
HHH-9154 - keywords as parameter names

(cherry picked from commit 5aff092e2bd06bcfc18eb6eec9983b2f97237d64)

Conflicts:
	hibernate-core/src/test/java/org/hibernate/test/hql/ASTParserLoadingTest.java
HHH-9154 - keywords as parameter names

   gah... missed in initial commit for cherry-pick
HHH-9200 - Natural id cache statistics are not cleared
HHH-9190 Introducing ParameterMetadataRecognizer contract in order to make retrieval fo parameter meta-data for native queries customizable
HHH-9190 Introducing QueryPlanFactory service contract in order to make creation of native query plans customizable
HHH-9190 : consolidate contracts

(cherry picked from commit fbe72e7b641fba2c95ce0b8867e080fb7e52613d)

Conflicts:
	hibernate-core/src/main/java/org/hibernate/engine/query/spi/ParameterMetadataRecognizerInitiator.java
HHH-9138 - CastFunctionTest failing on most databases

(cherry picked from commit c012c4d8de9aa68f42fed067184d2520594013d5)
[HHH-8941] add SQLFunctionTemplate for replace() to FirebirdDialect

Conflicts:
	hibernate-core/src/main/java/org/hibernate/dialect/FirebirdDialect.java
HHH-8941 simplified the dialect function
HHH-9201 - Evict cache instead of remove after transaction completion
HHH-9203 - ConcurrentNaturalIdCacheStatisticsImpl#getEntries() fails
with ClassCastException

Conflicts:
	hibernate-core/src/test/java/org/hibernate/test/naturalid/mutable/cached/CachedMutableNaturalIdStrictReadWriteTest.java