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