Merge proposals dependent on lp:~fboudra/launchpad-work-items-tracker/notification-addresses-update

1. notification-addresses-update
2. Dependent merge proposals