Merge "Convert compute-role.yaml to role.role.j2.yaml"