Merged revision(s) 1618938 from lucene/dev/trunk:
SOLR-6387: Try to fix this a second time...

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