@sebersole, updating OGM to use the latest ORM, I noticed some remaining issues:

1. EntityManagerFactoryImpl assumes that the underlying session factory is of type SessionFactoryImpl, which is not the case when plugging in the OGM session factory builder. This seems to work when changing the type of EntityManagerFactoryImpl#sessionFactory to SessionFactoryImplementor (which is implemented by the OGM SF implementation).
2. StandardServiceRegistryBuilder#build() creates a copy of the settings map. When adding a setting through a service contributor (via StandardServiceRegistryBuilder#applySetting(), that setting will be added to the original settings map in StandardServiceRegistryBuilder, whereas that copy (which is created prior invoking the contributors) is passed to the created service registry. I.e. the setting passed via applySetting() is not propagated to the created service registry.
3. In the OGM SessionFactoryBuilderFactory I would like to be able to access the default session factory builder (so ORM's SessionFactoryImpl can be instantiated and used as a delegate by the OGM session factory). This seem not exposed at the moment (also I cannot instantiate SessionFactoryBuilderImpl myself because its constructor is not visible).

1. and 2. should be easy to fix. For 3. the default SessionFactoryBuilder could be passed via SessionFactoryBuilderFactory#getSessionFactoryBuilder(MetadataImplementor metadata, SessionFactoryBuilder defaultBuilder). WDYT?