upgrade es upstream to v1.2.4

with cherry-picked crate-specific changes not yet merged to ES
Merge pull request #1057 from crate/m/upgrade_es_stable_v1.2.4

upgrade es upstream to v1.2.4