merge up to 924414

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