Kill all vestiges of GeoData's Solr support

Change-Id: Iea1fccae82c3c3f310299529624518149441e215
Merge "Kill all vestiges of GeoData's Solr support"