HHH-9106 : Merging multiple representations of the same entity merged
HHH-9239 HHH-9240 : FailureExpected test cases when merging entity copies with dirty collections
HHH-9106 : Merging multiple representations of the same entity
HHH-9106 : Merging multiple representations of the same entity (entitymanager test cases)
HHH-9106 : Merging multiple representations of the same entity (improved logging)

(cherry picked from commit fed3191eb7e4edb3dab7823219540c0d064669b9)
HHH-9234 : Test  failure (testNaturalIdChangedWhileAttached) on SAP/SYBASE ASE

(cherry picked from commit 257efd10254b40a41016ec29d4ee2e90bf6c4d87)
HHH-9106 : (corrected test case to work on MySQL)
HHH-9090 - HQL: parser is trying to reuse parent implied join for subquery

(cherry picked from commit 133f0825a3e97b123b3fb88f7971ced6e20ef600)
HHH-9268 The NoopOptimizer used for default id generation doesn't need synchronization
HHH-9269 Store persister to ReferenceCacheEntryImpl to avoid costly lookup at read time
HHH-9106 :  Merging multiple representations of the same entity (using StrategySelector)
HHH-9106 :  Merging multiple representations of the same entity (tests using StrategySelector)
HHH-9106 :  Merging multiple representations of the same entity (logging)
HHH-9231 Avoid updating collection 2LC if contains entity added in tx

(cherry picked from commit 3b098a94d3463086a230d6dbc1254e9ecbf76cda)

Conflicts:
	hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/BasicTransactionalTestCase.java
HHH-9231 : Avoid updating collection 2LC if contains entity added in tx
HHH-9231 : Uncommitted data can remain in transactional collection cache after rollback if collection is initialized after flush
HHH-9258 OsgiSessionFactoryService does not handle ServiceContributors
HHH-8237 Applying type configured via @ColumnMapping#type() for scalar results
HHH-8237 Applying type configured via @ColumnMapping#type() for constructor results
HHH-8683 Class org.hibernate.engine.spi.EntityEntry consumes lots of memory