Update elasticutils to master tip

This updates the code to use elasticutils master tip. The changes are pretty minor. I'm pretty sure I caught everything, but it's hard to tell since we only have 48 tests.

When reviewing, definitely review it commit-by-commit because one of the commits is a monstrosity of vendor-local changes which are totally not interesting.

r?