Merge "[common/elasticsearch] update elasticsearch image"