HITRCMIGRATION-34: Comment-47348: Update display and messages.
Reverted to Merge pull request #39 plus changed message type descriptions.
OA-436: Improve User Notification Settings UX
OA-436: Set correct notifiers
Merge pull request #42 from blatin/7.x-2.x

OA-436: Improve User Notification Settings UX