Issue #3487116: Update role_mappings to avoid data loss

Florian Weberrequested to merge
issue/openid_connect-3487116:3487116-update-rolemappings into 3.x

Closes #3487116

Merge request reports