(cherry picked from commit 83e57e083f2cf6c0de8a46966c5492faeabd8f2a) Conflicts: hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestSaveNamespace.java
(cherry picked from commit 83e57e083f2cf6c0de8a46966c5492faeabd8f2a) Conflicts: hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestSaveNamespace.java