CE upstream: Friday
Forgot to record the conflicting files, but the resolution is at https://gitlab.com/gitlab-org/gitlab-ee/commit/2c8e9ac18ee9563fe58129bbbc1037ff575c9287
Edited by username-removed-423915
Do not update/delete: Banner broadcast message test data
Do not update/delete: Notification broadcast message test data
Forgot to record the conflicting files, but the resolution is at https://gitlab.com/gitlab-org/gitlab-ee/commit/2c8e9ac18ee9563fe58129bbbc1037ff575c9287