Merge -c 1296905 from trunk to branch-0.23 to fix HADOOP-8137. Added links to CLI manuals to the site.