Checkstyle cleanup
More checkstyle
Moved tryLock to inner method
Renamed exception variable
checkstyle fix
Merge pull request #2753 from noctarius/checkstyle-hibernate-cleanup

Checkstyle cleanup for hibernate packages