svn merge -c 1301612 from trunk to branch-0.23 FIXES HADOOP-8176. Disambiguate the destination of FsShell copies (Daryn Sharp via bobby)