(cherry picked from commit d9014bda93760f223789d2ec9f5e35f40de157d4) Conflicts: hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/ha/TestStandbyCheckpoints.java
(cherry picked from commit d9014bda93760f223789d2ec9f5e35f40de157d4) Conflicts: hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/ha/TestStandbyCheckpoints.java