SOLR-6511: backport latest changes to branch_5x

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