HHH-8930 Make the rebuildSessionFactory() method be more aggressive
about closing

Conflicts:
	hibernate-testing/src/main/java/org/hibernate/testing/junit4/BaseCoreFunctionalTestCase.java