Merged revision(s) 1611441 from hadoop/common/trunk: HDFS-6693. TestDFSAdminWithHA fails on windows ( Contributed by Vinayakumar B )