Merge branch 'master' into _es
pre-update
Fix configuration
fix config
fix config
fix config
Merge branch 'Update_es' into _es
Merge branch '_es' into _es_jre

Conflicts:
	es/bin/elasticsearch-dataStore.bat
	es/bin/elasticsearch.bat