Merge 5-2-stable into master
Created by: bbodenmiller
Contains bug and guide fixes needed in master.
Do not update/delete: Banner broadcast message test data
Do not update/delete: Notification broadcast message test data
Created by: bbodenmiller
Contains bug and guide fixes needed in master.