Hibernate upgrade

Please do not merge this. I created this PR to save the changes in gitHub for future user stories. Once we integrate these changes to current branch for 4.4 release then we can close this PR.