HDFS-4358. Merge r1428711 from branch-1

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