Remove unused class which was package private anyway
More javadoc fixes
Fix checkstyle
Fix checkstyle
Merge remote-tracking branch upstream/$:{upbranch}