Configuration Updates
Update elasticsearch properties
Merge remote-tracking branch 'origin/master'

Conflicts:
	config/elasticsearch
Revert "Merge remote-tracking branch 'origin/master'"

This reverts commit 93f92c6cdbb0282e977cc919c8fb5ab32d4bf89e.