Upgrade hibernate
Merge pull request #3589 from mkurz/hibernateUpgrade

Upgrade hibernate