Merge proposals dependent on lp://staging/~edwin-grubbs/launchpad/bug-576388-proposing-invited-team

1. bug-576388-proposing-invited-team
2. Dependent merge proposals