[hibernate-issues] [Hibernate-JIRA] Closed: (HHH-6211) Fix bad pull request merge