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)