HDFS-3794. Merging change r1504973 from branch-1 to branch-1-win.

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