svn merge -c 1297771 trunk to branch-0.23 FIXES: HADOOP-8140. dfs -getmerge should process its argments better (Daryn Sharp via bobby)