Switch beta GeoData to Elasticsearch

Change-Id: I004571a5e22f87b1a1cc7a9721fd89425d1eaacf