HHH-8283 missed a few commits
HHH-8255 made a few hibernate-core imports optional in the manifest
Conflicts:
	hibernate-core/hibernate-core.gradle