Checkstyle cleanup for hibernate packages

The funky locking again.