Addressed findbugs and checkstyle regressions Findbugs report generated with version 1.3.9. Checkstyle report generated with version 5.5.