svn merge -c 1459586 from trunk for HDFS-4615. Fix TestDFSShell failures on Windows.


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