Set default but overridable ES_HEAP_SIZE based on memory available to current OS
Merge remote-tracking branch 'upstream/master'
Syncing master