Clean up branch to fix issue 145 (bulk emails not being decorated)
Clean up branch based on abompard's branch.
Do not update/delete: Banner broadcast message test data
Do not update/delete: Notification broadcast message test data
Clean up branch based on abompard's branch.