Merge "[DCAEMOD] Uses new tpls for repos / images"