Merge proposals dependent on lp://staging/~nskaggs/ubuntu-sponsoring/core-apps-test-sponsoring

1. core-apps-test-sponsoring
2. Dependent merge proposals