Merge proposals dependent on lp://qastaging/~ci-train-bot/account-polld/account-polld-ubuntu-yakkety-landing-055

1. account-polld-ubuntu-yakkety-landing-055
2. Dependent merge proposals