svn merge -c 1511464 FIXES: MAPREDUCE-5425. Junit in TestJobHistoryServer failing in jdk 7. Contributed by Robert Parker


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1511467 13f79535-47bb-0310-9956-ffa450edef68
HDFS-4926. Merge change r1511477 from trunk.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1511478 13f79535-47bb-0310-9956-ffa450edef68
HDFS-5071. Merging change r1511502 from trunk

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1511505 13f79535-47bb-0310-9956-ffa450edef68
HDFS-4763. Merging change r1511519 from trunk

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1511522 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-9315-branch-2-gd