Backports for 0.92.x
Cherry-picked commits (mostly bug fixes) from bzr trunk and a few from git master.
Edited by username-removed-401586
Do not update/delete: Banner broadcast message test data
Do not update/delete: Notification broadcast message test data
Cherry-picked commits (mostly bug fixes) from bzr trunk and a few from git master.