SOLR-3617: hardening command-line parsing and a few minor bug fixes found by QA testing.

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1619025 13f79535-47bb-0310-9956-ffa450edef68