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