Solr-2894: Apply patch / fix patch