More Hibernate 6.2 compatibility.

Change-Id: Ib06822de4e2d64419a8285c0a46b2d8931cea4c8
7 files changed