[hibernate-commits] [hibernate/hibernate-orm] e02317: HHH-17795 fix an NPE and add a test for 'on confli...