Merge proposals dependent on lp:~ci-train-bot/online-accounts-api/online-accounts-api-ubuntu-yakkety-1971

1. online-accounts-api-ubuntu-yakkety-1971
2. Dependent merge proposals