Merge proposals dependent on lp://staging/~ci-train-bot/ubuntu-system-settings/ubuntu-system-settings-ubuntu-zesty-2605

1. ubuntu-system-settings-ubuntu-zesty-2605
2. Dependent merge proposals