76c30e4f3c
(cherry picked from commit 79c97f6a0bebc95ff81a8ef9b07d3619f05ed583) Conflicts: hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestSaveNamespace.java