HHH-7947 remove not maintained 2LC from doc
HHH-465 - Support for NULLS FIRST/LAST

Conflicts:
	hibernate-core/src/main/java/org/hibernate/cfg/Settings.java
	hibernate-core/src/main/java/org/hibernate/criterion/Order.java
HHH-7948 - Fix and test
HHH-7580 - Complete 2-phase SessionFactory building design

Conflicts:
	hibernate-core/src/main/java/org/hibernate/SessionFactory.java
	hibernate-core/src/main/java/org/hibernate/boot/registry/StandardServiceRegistryBuilder.java
	hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryImpl.java
	hibernate-core/src/main/java/org/hibernate/metamodel/MetadataSources.java
	hibernate-core/src/main/java/org/hibernate/metamodel/SessionFactoryBuilder.java
	hibernate-core/src/main/java/org/hibernate/metamodel/internal/SessionFactoryBuilderImpl.java
	hibernate-core/src/main/java/org/hibernate/metamodel/source/internal/JaxbHelper.java
	hibernate-core/src/main/java/org/hibernate/metamodel/source/internal/MetadataBuilderImpl.java
	hibernate-core/src/main/java/org/hibernate/metamodel/source/internal/MetadataImpl.java
	hibernate-core/src/main/java/org/hibernate/service/spi/ServiceContributor.java
	hibernate-core/src/test/java/org/hibernate/cfg/beanvalidation/ApplySchemaConstraintTest.java
	hibernate-core/src/test/java/org/hibernate/metamodel/binding/BasicCollectionBindingTests.java
	hibernate-core/src/test/java/org/hibernate/metamodel/internal/source/AssertSourcesTest.java
	hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/entity/BaseAnnotationBindingTestCase.java
	hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/xml/OrmXmlParserTests.java
	hibernate-core/src/test/java/org/hibernate/metamodel/source/internal/MetadataImplTest.java
	hibernate-core/src/test/java/org/hibernate/metamodel/spi/binding/AbstractBasicBindingTests.java
	hibernate-core/src/test/java/org/hibernate/metamodel/spi/binding/AbstractUnsavedValueTests.java
	hibernate-core/src/test/java/org/hibernate/metamodel/spi/binding/JoinedSubclassBindingTests.java
	hibernate-core/src/test/java/org/hibernate/metamodel/spi/binding/basiccollections/AbstractBasicCollectionBindingTests.java
	hibernate-core/src/test/java/org/hibernate/metamodel/spi/binding/onetomany/AbstractUnidirectionalOneToManyBindingTests.java
	hibernate-core/src/test/java/org/hibernate/metamodel/spi/relational/AbstractGeneratedIdColumnTests.java
	hibernate-core/src/test/java/org/hibernate/test/jdbc/internal/BatchingTest.java
	hibernate-core/src/test/java/org/hibernate/test/service/schema/internal/ExistingDatabaseMetaDataImplTest.java
	hibernate-entitymanager/src/main/java/org/hibernate/jpa/boot/internal/EntityManagerFactoryBuilderImpl.java
	hibernate-entitymanager/src/main/java/org/hibernate/jpa/boot/internal/EntityManagerFactoryBuilderUsingMetamodelImpl.java
	hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/NodeEnvironment.java
	hibernate-testing/src/main/java/org/hibernate/testing/junit4/BaseCoreFunctionalTestCase.java
HHH-7580 compile error

Conflicts:
	hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/InfinispanRegionFactory.java
	hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/JndiInfinispanRegionFactory.java
	hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/cluster/ClusterAwareRegionFactory.java
HHH-7580 Corrected a few failures after the cherry-pick into master
HHH-7942 Added org.osgi:org.osgi.core dependency
HHH-7942 Committing Steve and Martin's initial bundle-activator and
class loading prototypes
HHH-7941 Script OSGi manifest creation in Gradle