Picked from CE
See https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2048
Conflicts: Gemfile.lock
Do not update/delete: Banner broadcast message test data
Do not update/delete: Notification broadcast message test data
Picked from CE
See https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2048
Conflicts: Gemfile.lock