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

(cherry picked from commit 70532259faa14064cff8263cbb7ad6d82d607892)

Conflicts:
	hibernate-core/src/main/java/org/hibernate/engine/internal/StatefulPersistenceContext.java
	hibernate-core/src/main/java/org/hibernate/event/internal/DefaultMergeEventListener.java
	hibernate-core/src/main/java/org/hibernate/event/internal/EventCache.java
	hibernate-core/src/test/java/org/hibernate/event/internal/EventCacheTest.java
	hibernate-core/src/test/java/org/hibernate/test/ops/AbstractOperationTestCase.java
	hibernate-core/src/test/java/org/hibernate/test/ops/Category.java
	hibernate-core/src/test/java/org/hibernate/test/ops/Hoarder.hbm.xml
	hibernate-core/src/test/java/org/hibernate/test/ops/Hoarder.java
	hibernate-core/src/test/java/org/hibernate/test/ops/Item.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)
HHH-9106 : Merging multiple representations of the same entity (entitymanager test cases)

(cherry picked from commit 055b0cacaec4fbb136a1fc592fa00cb7e950eb61)
HHH-9106 : Merging multiple representations of the same entity
HHH-9106 : Merging multiple representations of the same entity (improved logging)
HHH-9248 : Skip CastFunctionTest.testFloatCasting and testLongCasting for MySQL
HHH-9234 : Test  failure (testNaturalIdChangedWhileAttached) on SAP/SYBASE ASE
HHH-9106 : (corrected test case to work on MySQL)

(cherry picked from commit 3a8041953d950db15513cecc36db38ee286c8a30)
HHH-7689 - addToBatch in BatchingBatch blows out of error handling and doesn't abort the batch

(cherry picked from commit 075bc8620907ba8d3ef6ac20c585035184574428)
HHH-7689 - addToBatch in BatchingBatch blows out of error handling and doesn't abort the batch

(cherry picked from commit 0e164d1c9d3e5c5389bfb877f9e48881d5b95625)
HHH-7689 - Error executing batch should abort rest of batch for "cleanliness" sake

(cherry picked from commit 4a898c55244587faeaf6eef585221d3601ca929b)
HHH-9090 - HQL: parser is trying to reuse parent implied join for subquery
HHH-9255 : Revert HHH-9222 on 4.2 branch
HHH-9106: revert HHH-9106 on 4.2 branch
4.2.14.Final release
Update version to 4.2.15-SNAPSHOT
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-9231 HHH-5690 : Test cases for transactional cache strategy

(cherry picked from commit af5791f6dd5b8b82e4786a146375e583c12037b7)

Conflicts:
	hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/BasicTransactionalTestCase.java