Cleanups and refactorings after Mark's suggestions.

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/solr5914@1584633 13f79535-47bb-0310-9956-ffa450edef68
Add test-help info

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