LUCENE-4998, LUCENE-5242, LUCENE-5254, LUCENE-5262, LUCENE-5263, LUCENE-5264: svn merge -c 1522723 -c 1525896 -c 1529136 -c 1529141 -c 1530063 -c 1530416 -c 1530657

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