(cherry picked from commit 5cb1e0118b173a95c1f7bdfae1e58d7833d61c26) Conflicts: hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/ha/BootstrapStandby.java hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/ha/TestBootstrapStandby.java (cherry picked from commit 3c0ae5914ca673b055a9673b4c17c8aaa570c258)