SOLR-6485

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

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