svn merge -c 1459592 from trunk for HDFS-4584. Skip TestNNWithQJM.testNewNamenodeTakesOverWriter() on Windows.