Elasticsearch plugin updates

Change-Id: Ib6eb400ebff537cb369b87f443c2249f687dd399