HADOOP-9770. Merge 1507416 from branch-2.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.1-beta@1507417 13f79535-47bb-0310-9956-ffa450edef68
HADOOP-9507. Merging change r1507431 from branch-2 to branch-2.1-beta.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.1-beta@1507436 13f79535-47bb-0310-9956-ffa450edef68
svn merge -c 1507486 FIXES: MAPREDUCE-5419. TestSlive is getting FileNotFound Exception. Contributed by Robert Parker


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