(cherry picked from commit 2338d25dc7150d75fbda84cc95422380b5622224) Conflicts: hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/web/TestWebHDFS.java
(cherry picked from commit 2338d25dc7150d75fbda84cc95422380b5622224) Conflicts: hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/web/TestWebHDFS.java