[WIP] Upgrading Elasticsearch (bug 1013874)