Lots of minor cleanup
More work
Supression fixes
Resolved findbugs issue
Removed unwanted findbugs supression
Resolved merge conflicts
Fixed NPE
Merge pull request #2830 from pveentjer/checkstyle/3.x/invocation

Checkstyle/3.x/invocation