Isolating Hibernate to move to JPA

Change-Id: Ia0c0235a9b4afb6297f009b7aeedbb49af41f6a2