Signed-off-by: Masatake Iwasaki <iwasakims@apache.org> (cherry picked from commit da0006fe0473e353ee2d489156248a01aa982dfd) Conflicts: hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeHttpServer.java
Signed-off-by: Masatake Iwasaki <iwasakims@apache.org> (cherry picked from commit da0006fe0473e353ee2d489156248a01aa982dfd) Conflicts: hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeHttpServer.java