Fix #402 multiple-values are not returned (reverted)
Reintroduce fix for additional coverity warnings.
Do not update/delete: Banner broadcast message test data
Do not update/delete: Notification broadcast message test data
Reintroduce fix for additional coverity warnings.