Backport #1926 to 3-2-maintenance.
Created by: myronmarston
It wasn't easy to cherry-pick so I did this commit by hand. Will merge when it goes green.
Do not update/delete: Banner broadcast message test data
Do not update/delete: Notification broadcast message test data
Created by: myronmarston
It wasn't easy to cherry-pick so I did this commit by hand. Will merge when it goes green.