Cleanup qqq.
Update i18n keys to remapp old ones to new ones where applicable.
wfMsg -> ->Message
Merge branch 'bugid-96446' into dev