Solr-2894
Solr-2894: fix compile
Solr-2894: Apply patch / fix patch