Elasticsearch support

Change-Id: Ie6eef11ebdbead62d60eef113879eccf45ec4aea
Merge "Elasticsearch support"