Merging trunk changes

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