Merge "Update Elasticsearch repo"