[INTEGRATED-946] Removed unused statements and fixed merge issue
[INTEGRATED-946] Removed unused statements and fixed merge issue

integratedfordevelopers/integrated-solr-bundle,integratedfordevelopers/integrated,integratedfordevelopers/integrated-solr-bundle,integratedfordevelopers/integrated,integratedfordevelopers/integrated