Revert "Merge branch 'tc-no-todo-service-select' into 'master'"
This MR is breaking MySQL builds, so I'm reverting it for now.
Do not update/delete: Banner broadcast message test data
Do not update/delete: Notification broadcast message test data
This MR is breaking MySQL builds, so I'm reverting it for now.