HDFS-5404: Resolve regressions in Windows compatibility on HDFS-4949 branch.