Backport strict predicate fix
Created by: JonRowe
This fix was initialy made in 4-0-dev but is arguably a bug fix so can be backported to 3.10
Do not update/delete: Banner broadcast message test data
Do not update/delete: Notification broadcast message test data
Created by: JonRowe
This fix was initialy made in 4-0-dev but is arguably a bug fix so can be backported to 3.10