SOLR-5474 Fix NPE in tests (some more) (merged trunk r1626602)

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