upgrade es upstream to v1.2.4

with cherry-picked crate-specific changes not yet merged to ES