HHH-7944 envers classloader issues
HHH-7998 - Add TypeContributions contract

Conflicts:
	hibernate-core/src/main/java/org/hibernate/dialect/Dialect.java
	hibernate-core/src/main/java/org/hibernate/metamodel/internal/MetadataImpl.java
	hibernate-core/src/main/java/org/hibernate/metamodel/spi/TypeContributor.java
HHH-7995 Added support for TypeContributors in OSGi.  Integrated with
envers
HHH-8225 EMF cannot be created, closed, then re-created in OSGi
Conflicts:
	hibernate-osgi/src/main/java/org/hibernate/osgi/OsgiClassLoader.java
	hibernate-osgi/src/main/java/org/hibernate/osgi/OsgiPersistenceProvider.java
HHH-8217 Make generated constraint names short and non-random

Conflicts:
	hibernate-core/src/main/java/org/hibernate/cfg/AnnotationBinder.java
	hibernate-core/src/main/java/org/hibernate/cfg/Configuration.java
	hibernate-core/src/main/java/org/hibernate/mapping/Constraint.java
	hibernate-core/src/main/java/org/hibernate/mapping/UniqueKey.java
HHH-8226
HHH-6813 @Id @OneToOne cause NullPointerException during query
HHH-8236 Update to hibernate-commons-annotations 4.0.2.Final
HHH-2664 full join not working
HHH-8238 OsgiJtaPlatform null pointer exception
Conflicts:
	hibernate-osgi/src/main/java/org/hibernate/osgi/OsgiJtaPlatform.java
Update DefaultInitializeCollectionEventListener.java
HHH-6813 @Id @OneToOne cause NullPointerException during query
HHH-8254 throw HibernateException when transaction is rolledback by a
reaper thread
Conflicts:
	hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/transaction/TransactionJoiningTest.java
HHH-6813 Corrected EntityType#getRHSUniqueKeyPropertyName() and added
regression test.
HHH-8112 OSGi quickstart tutorial projects
HHH-8112 removed variables from POMs -- not supported by docbook
HHH-8083 @OrderColumn not updated on @OneToMany cascade

Conflicts:
	hibernate-core/src/main/java/org/hibernate/action/internal/CollectionUpdateAction.java
4.2.2.Final release
4.2.2.Final post release
HHH-8269 DenormalizedTable FK constraint names can be too long