- updated Configuration to include ElasticSearch.
Merge remote-tracking branch 'ratanasv/update-conf-for-ES' into es-discovery