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