SOLR-6632

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1632751 13f79535-47bb-0310-9956-ffa450edef68
SOLR-6551

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