(cherry picked from commit 0ed9c2d8fec93b5dac9c305eda272ad8dfd869a9) Conflicts: hadoop-hdfs-project/hadoop-hdfs/src/site/markdown/HDFSCommands.md
(cherry picked from commit 0ed9c2d8fec93b5dac9c305eda272ad8dfd869a9) Conflicts: hadoop-hdfs-project/hadoop-hdfs/src/site/markdown/HDFSCommands.md