Merge branch Mario/misc_fixes (S merge request)
Some minor cleanup and fixes, mostly messages moved to notifications system.
Do not update/delete: Banner broadcast message test data
Do not update/delete: Notification broadcast message test data
Some minor cleanup and fixes, mostly messages moved to notifications system.