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