[hibernate-commits] [hibernate/hibernate-orm] 534836: fixing test failures in the merge