Merge proposals dependent on lp://qastaging/~ci-train-bot/account-polld/account-polld-ubuntu-zesty-2227

1. account-polld-ubuntu-zesty-2227
2. Dependent merge proposals