Merge "Add missing parts for renaming of the call redirection role."