Merge "Replace per role manifests with a common role manifest"