Merge "Switch Elasticsearch to 5 version"