svn merge -c 1487647 from trunk for HDFS-4846. Clean up snapshot CLI commands output stacktrace for invalid arguments.