(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 8e54da1511e78477c1d4655d5ff0a69d0330869f) Conflicts: hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestEditLogRace.java