SOLR-4221 SOLR-4808 SOLR-5006 SOLR-5017 SOLR-4222

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