Polishing after static analysis and more checkstyle rules

 - https://hibernate.atlassian.net/browse/HSEARCH-1418
 - https://hibernate.atlassian.net/browse/HSEARCH-1419
 - https://hibernate.atlassian.net/browse/HSEARCH-1420
 - https://hibernate.atlassian.net/browse/HSEARCH-1421