[hibernate-commits] [hibernate/hibernate-core] 6e7165: HHH-6211 - Fix bad pull request merge