Merge proposals dependent on lp://staging/~brian-murray/launchpad/x-launchpad-bug-modifier-follow-on

1. x-launchpad-bug-modifier-follow-on
2. Dependent merge proposals