Updates EmailNotification and testEmailNotificationClasses.
Merge branch 'origin/dev'