MAPREDUCE-4914. Merging change 1429638 from branch-1

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-1-win@1429642 13f79535-47bb-0310-9956-ffa450edef68
MAPREDUCE-4915. Merge 1429641 from branch-1

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