Move SOLR-4567 from 4.3 to 4.2.1 (merged trunk r1457629)

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