Port of 27610-issue-number-alignment to EE
Description of the MR and relevant screenshot can be found in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9020
Do not update/delete: Banner broadcast message test data
Do not update/delete: Notification broadcast message test data
Description of the MR and relevant screenshot can be found in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9020