SOLR-6015: Backport fixes from trunk to branch_4x.

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