Merge "[COMMON][ELASTIC] Uses new tpls for repos / images"