Fixed some findbugs issues, minor renaming and improved javadoc
Fixed typo
Merge pull request #4064 from pveentjer/fix/3.x/minor-improvements

Fixed some findbugs issues, minor renaming and improved javadoc