Upgrade to hibernate 5 with persistence tests running #4716
merge validation commits r23146, r23162, r23163 into trunk
merge validation2 and model 3.5 into trunk