SOLR-6632

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

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