svn merge -c 1296386 trunk to branch-0.23 FIXES HADOOP-8131. FsShell put doesn't correctly handle a non-existent dir (Daryn Sharp via bobby)