(cherry picked from commit 00d5e631b596f8712600879366e5283829e7ee5d) (cherry picked from commit eca7bc7ac4292ff08b9e1ea2e22116d6e58e8b95) Conflicts: hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java
(cherry picked from commit 00d5e631b596f8712600879366e5283829e7ee5d) (cherry picked from commit eca7bc7ac4292ff08b9e1ea2e22116d6e58e8b95) Conflicts: hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java