Merge proposals dependent on lp:~edwin-grubbs/launchpad/bug-451208-subscribing-reveals-email

1. bug-451208-subscribing-reveals-email
2. Dependent merge proposals