LUCENE-5904: backport to 4.10.1

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_4_10@1626204 13f79535-47bb-0310-9956-ffa450edef68
LUCENE-5922: backport to 4.10.1

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