Merge branch '431713-fix-custom-role-creation' into 'master'

Fix custom role creation and some other issues

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/140003



Merged-by: David Pisek <dpisek@gitlab.com>
Approved-by: David Pisek <dpisek@gitlab.com>
Reviewed-by: David Pisek <dpisek@gitlab.com>
Co-authored-by: Daniel Tian <dtian@gitlab.com>