HHH-9106 : Merging multiple representations of the same entity merged

(cherry picked from commit 70532259faa14064cff8263cbb7ad6d82d607892)

Conflicts:
	hibernate-core/src/test/java/org/hibernate/test/ops/MergeTest.java
	hibernate-core/src/test/resources/log4j.properties
HHH-9239 HHH-9240 : FailureExpected test cases when merging entity copies with dirty collections

(cherry picked from commit c7c5b015c134df993de4105a2bc3e70d7e14ad68)
HHH-9106 : Merging multiple representations of the same entity

(cherry picked from commit 2daaf9a1965b70897928ea222ea8708acaad3bbd)

Conflicts:
	hibernate-core/src/test/resources/log4j.properties
HHH-9106 : Merging multiple representations of the same entity (entitymanager test cases)

(cherry picked from commit 055b0cacaec4fbb136a1fc592fa00cb7e950eb61)
HHH-9245 : <list> mapped in hbm.xml ends up as a bag (test case)
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)

(cherry picked from commit 3a8041953d950db15513cecc36db38ee286c8a30)
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-9221 - Binder#bindIdentifierGenerator leads to NPE due to bad Map calls
HHH-9106 :  Merging multiple representations of the same entity (using StrategySelector)

(cherry picked from commit 6203b5da308ad45167ad0cbcc44214433b4e7f7b)
HHH-9106 :  Merging multiple representations of the same entity (tests using StrategySelector)

(cherry picked from commit 368cdc1966b2018e03a3a5a0a6cf420a9939c398)
HHH-9106 :  Merging multiple representations of the same entity (logging)

(cherry picked from commit 31bcb0ea0a73c32bbb430ac6eed54005f01a40f2)

Conflicts:
	hibernate-core/src/test/resources/log4j.properties
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

(cherry picked from commit 36e35207f6f30f0236844dbcf898714070ad8cfe)

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

(cherry picked from commit 4851ab01dfc2c58c19bf08a68854593923907716)
HHH-9231 : Uncommitted data can remain in transactional collection cache after rollback if collection is initialized after flush

(cherry picked from commit f9a49efd179f2c644674f9872d57a45f11a1dca3)
HHH-9258 OsgiSessionFactoryService does not handle ServiceContributors
HHH-9281 : Table name generated for @ElementCollection uses owning entity class name instead of mapped entity name

(cherry picked from commit ccffe0dea9d9d4aae05ffaaa9239ff5ac5b3346a)

Conflicts:
	hibernate-core/src/test/java/org/hibernate/test/annotations/collectionelement/CollectionElementTest.java