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