[hibernate-dev] Backports for 3.6.10