SOLR-6533,SOLR-6654

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

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