Merge conflicts for !2155
This MR is to resolve conflicts which occurred while picking !2094 (merged) into 9-3-stable-ee for RC3.
Edited by kushalpandya
Do not update/delete: Banner broadcast message test data
Do not update/delete: Notification broadcast message test data
This MR is to resolve conflicts which occurred while picking !2094 (merged) into 9-3-stable-ee for RC3.