Merge "Replace Eclipselink with Hibernate"