(cherry picked from commit ba62b50ebacd33b55eafc9db55a2fe5b4c80207a) Conflicts: hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
(cherry picked from commit ba62b50ebacd33b55eafc9db55a2fe5b4c80207a) Conflicts: hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java