LUCENE-5599, LUCENE-5600, LUCENE-5628: backport to 4.8.x

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