HADOOP-8745. Merge r1382134 from branch-1

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-1-win@1485462 13f79535-47bb-0310-9956-ffa450edef68
HADOOP-8981. Merge change 1485464 from branch-1

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