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

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