Merge "Remove 'Controller' role references from overcloud.j2.yaml"