[hibernate-dev] Jakarta EE 9 / JPA 3: reverting changes from master