Rejig role hierarchy (competition_admin and team_admin+union_admin are parallel)
CS fixes