Fix references to Administrator role and other improvements See merge request gitlab-org/gitlab!79489
