Port config changes to upstream
Pull ElasticSearch info from config
Merge remote-tracking branch 'upstream/master' into config
Fix ElasticSearch config
Merged config changes