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.