SOLR-4842: Merge from branch_4x

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