Merge branch-1 to branch-1-win. (cnauroth)

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