Upgrade to Hibernate 4.0.2

Change-Id: I406e67a5d9f272c455e06b591ad9ce100dc8753d