HHH-9064 Simplify/improve the hibernate-osgi tests