Do not update/delete: Banner broadcast message test data
Do not update/delete: Notification broadcast message test data
backport of #24811
Did not backport 436f4de3 (not applicable to legacy option parser) 632f2633 needed to be recreated from scratch PTAL... comments inline about major differences