SOLR-6844: Rename ConfigSolr.getZkHostPort(), which actually returns the Solr port, to .getSolrHostPort() (merged trunk r1645034)

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/branch_5x@1645037 13f79535-47bb-0310-9956-ffa450edef68
SOLR-6604: SOLR-6812: Fix NPE with distrib.singlePass=true and expand component. Increased test coverage of expand component with docValues.

This closes #98.

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