(cherry picked from commit ae90d4dd908cf3f9e9ff26fa8e92f028057a9ca1) Conflicts: hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/web/webhdfs/WebHdfsHandler.java
(cherry picked from commit ae90d4dd908cf3f9e9ff26fa8e92f028057a9ca1) Conflicts: hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/web/webhdfs/WebHdfsHandler.java