HADOOP-9607. Fixes in Javadoc build. Contributed by Timothy St. Clair

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1487981 13f79535-47bb-0310-9956-ffa450edef68
HADOOP-9605. Update junit dependency. Contributed by Timothy St. Clair.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1487982 13f79535-47bb-0310-9956-ffa450edef68
Merge remote branch 'origin/branch-2' into branch-2-gd
Merge remote branch 'origin/branch-2-gd' into fb-HADOOP-7435-branch-2-gd