69acab5f23
(cherry picked from commit d27d7fc72e279614212c1eae52a84675073e89fb) Conflicts: hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java (cherry picked from commit 83f7f62be379045ad6933689b21b76c7086f919d)