svn merge -c 1584763 from trunk for HDFS-6189. Multiple HDFS tests fail on Windows attempting to use a test root path containing a colon.


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