Backport of MR !59 to the 4.x branch.
Fixes 8 NotificationTest failures on the "next minor" core matrix, caused by core #3555537 lowering the charset token to utf-8.
Refs #3586102, core #3555537.