(cherry picked from commit 39dc7345b80e27ba8bd1ff4c19ca241aef5ac0fc) (cherry picked from commit abe14d32d41b4a2bf630e8a89d794d729cee119b) Conflicts: hadoop-hdfs-project/hadoop-hdfs/src/site/markdown/WebHDFS.md
(cherry picked from commit 39dc7345b80e27ba8bd1ff4c19ca241aef5ac0fc) (cherry picked from commit abe14d32d41b4a2bf630e8a89d794d729cee119b) Conflicts: hadoop-hdfs-project/hadoop-hdfs/src/site/markdown/WebHDFS.md