Solr -> ElasticSearch

Change-Id: Id3568402ef42901e701e3174b876b808a3321e68
Merge "Solr -> ElasticSearch"