Various findbugs parsing related fixes
Merge pull request #2086 from pveentjer/findbugs-parsing

Various findbugs parsing related fixes