The name of the group also serves as the group tab's title in the docs
app and having "Collaborator" (singular) as a title for a list of people
didn't read well.
Changing th group name (and thus tab title) to "Collaborators" (plural).
PR Close#29553
PR #28930 was originally only merged into master. Later is was
backported to the patch branch as 34395ae, but some changes were missed.
This commit backports the missing bits to get the contributors and
related infrastructure in sync with master. This makes it easier to
backport future changes.
PR Close#29584
Alex Eagle