SOLR-2894 - reapplying patch after 4.5 merge