(cherry picked from commit 66461ed98b0b2f630b682bff927dbd74c251c26e) Conflicts: hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/web/DatanodeHttpServer.java
(cherry picked from commit 66461ed98b0b2f630b682bff927dbd74c251c26e) Conflicts: hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/web/DatanodeHttpServer.java