(cherry picked from commit e01c1a979cbc8fb398d5b7a46693657bc2668a58) Conflicts: hadoop-hdfs-project/hadoop-hdfs/src/main/bin/start-dfs.sh hadoop-hdfs-project/hadoop-hdfs/src/site/markdown/HdfsUserGuide.md
(cherry picked from commit e01c1a979cbc8fb398d5b7a46693657bc2668a58) Conflicts: hadoop-hdfs-project/hadoop-hdfs/src/main/bin/start-dfs.sh hadoop-hdfs-project/hadoop-hdfs/src/site/markdown/HdfsUserGuide.md