SOLR-6550: backport to 4_10 branch so we can backport SOLR-6511

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