SOLR-5914: Merge branch up to trunk, make all tests pass, make some other improvements and small changes.

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