(cherry picked from commit 8e54da1511e78477c1d4655d5ff0a69d0330869f) Conflicts: hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestEditLogRace.java (cherry picked from commit 2dd27c999b22c550058de0e6eca7209b346cd143) Conflicts: hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestEditLogRace.java (cherry picked from commit a5da4df73c525d68c76487509660a6b13f7fe99e)