SOLR-4744: hackish attempt to get basic non cloud functionality to work again (merge r1489222)

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