Merge "Set properly the cluster name for Elasticsearch cluster instance" into release/proposed/2019.2.0