(cherry picked from commit e780556ae9229fe7a90817eb4e5449d7eed35dd8) Conflicts: hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/http/TestHttpServer.java
(cherry picked from commit e780556ae9229fe7a90817eb4e5449d7eed35dd8) Conflicts: hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/http/TestHttpServer.java