MAPREDUCE-4909. Merge r1428620 from branch-1 to branch-1-win

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-1-win@1428623 13f79535-47bb-0310-9956-ffa450edef68
HDFS-4355. Merging change r1428631 from branch-1

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