TRUNK-4055 Substitute deprecated Hibernate.* fields

See https://tickets.openmrs.org/browse/TRUNK-4055