Merge "Increase the Elasticsearch service timeout"