HADOOP-9174. Merge change 1428102 from branch-1

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

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