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