Offboarding updates

Refinements based on experience.

Also takes care of:

• https://dev.gitlab.org/gitlab/organization/issues/804
• https://dev.gitlab.org/gitlab/organization/issues/808