NR-587 : Implement plugin changes for Solr integration