Revert "Merge branch 'revert-f2421b2b' into 'master'"
Re-add https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/13619 back into master
Do not update/delete: Banner broadcast message test data
Do not update/delete: Notification broadcast message test data
Re-add https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/13619 back into master