(cherry picked from commit c3b3b36dee475e5f37f85946be1a42a1b1e622a5) Conflicts: hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/TestDFSZKFailoverController.java
(cherry picked from commit c3b3b36dee475e5f37f85946be1a42a1b1e622a5) Conflicts: hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/TestDFSZKFailoverController.java