Fixing more Solr test offenders.

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene5650@1595676 13f79535-47bb-0310-9956-ffa450edef68
Merging with trunk.

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