Merge proposals dependent on lp://qastaging/~ci-train-bot/sync-monitor/sync-monitor-ubuntu-yakkety-landing-012

1. sync-monitor-ubuntu-yakkety-landing-012
2. Dependent merge proposals