svn merge -c 1573604 merging from trunk to branch-2.4 to fix:HADOOP-10314. The ls command help still shows outdated 0.16 format. Contributed by Rushabh S Shah.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.4@1573607 13f79535-47bb-0310-9956-ffa450edef68