(cherry picked from commit ce29074685abaa88ae9586fe8277aca23f9d54d6) Conflicts: hadoop-common-project/hadoop-common/src/site/apt/FileSystemShell.apt.vm
(cherry picked from commit ce29074685abaa88ae9586fe8277aca23f9d54d6) Conflicts: hadoop-common-project/hadoop-common/src/site/apt/FileSystemShell.apt.vm