a47c4e7819
Conflicts: hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/ha/TestBootstrapStandby.java Change-Id: Iffa62547483c1d9dc82a196d5e8d0856b397217d