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