(cherry picked from commit cce35c38159b23eb55204b3c9afcaa3215f4f4ef) Conflicts: hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/HttpServer2.java
(cherry picked from commit cce35c38159b23eb55204b3c9afcaa3215f4f4ef) Conflicts: hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/HttpServer2.java