Merge "Make RoleParameters and key_name descriptions consistent"