Be less restrictive on key comment extraction
This is the same pull request as #8515, rebased to the current master.
Do not update/delete: Banner broadcast message test data
Do not update/delete: Notification broadcast message test data
This is the same pull request as #8515, rebased to the current master.