Fix javac, javadoc and checkstyle issues before branch-2 merge.
55 files changed