Bug 893188 - Update system message manager
Merge pull request #10951 from KevinGrandon/bug_893188_fix_system_messages

Bug 893188 - Update system message manager r=vingtetun