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.1-beta@1511470 13f79535-47bb-0310-9956-ffa450edef68
HDFS-4926. Merge change r1511478 from branch-2.

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

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

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.1-beta@1511523 13f79535-47bb-0310-9956-ffa450edef68