Move SOLR-4537 from 4.3 to 4.2.1 (merged trunk r1457614)
Move SOLR-4537 from 4.3 to 4.2.1 (merged trunk r1457614)

git-svn-id: 13f9c63152c129021c7e766f4ef575faaaa595a2@1457615 13f79535-47bb-0310-9956-ffa450edef68

PATRIC3/p3_solr,PATRIC3/p3_solr,PATRIC3/p3_solr,PATRIC3/p3_solr,PATRIC3/p3_solr,PATRIC3/p3_solr,PATRIC3/p3_solr