CE Port for Group Roadmap changes

See merge request gitlab-org/gitlab-ce!16908