Merge remote-tracking branch 'origin/master' into update-trace-handling-code
EE counterpart for https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/10311.
Do not update/delete: Banner broadcast message test data
Do not update/delete: Notification broadcast message test data
EE counterpart for https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/10311.