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 (cherry picked from commit d7ca016d63d89e5c8377a035f93485a7c77c3430)