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
HHH-5811 : Flush causes update query on field of type Byte[]

(cherry picked from commit 4007655045711ddf89925c76310f31f81530dfa6)
HHH-8310 : Lob proxy class loading problem

(cherry picked from commit 365bfe99d857b7fa62108cff05fba28a5fb7b7e6)
HHH-9282 : Revert HHH-9222 on master
HHH-9285 Upgrade to Hibernate Commons Annotations version 4.0.5.Final