(cherry picked from commit 85cd06f6636f295ad1f3bf2a90063f4714c9cca7) Conflicts: hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/web/resources/NamenodeWebHdfsMethods.java hadoop-hdfs-project/hadoop-hdfs/src/main/resources/hdfs-default.xml