SOLR-5543: Backport to 4.6 branch, for 4.6.1 release.


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