Kill Solr support

Change-Id: I29fc406ba085795db68911487ee074b3eae6e8a2
Merge "Kill Solr support"