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