ddea9d68a0
(cherry picked from commit 15d8f592b51d08a658e88c6a7a7596e0edf5793b) (cherry picked from commit 7e10dd03b5e1a3f22b55a3b970239611e6f078c0) Conflicts: hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/web/TestWebHDFS.java