SOLR-6564: Fix failing ExitableDirectoryReader tests for Solr (Merge from trunk, r1628872)

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