Merge proposals dependent on lp://staging/~untrusted-ci-dev-bot/ubuntu-system-settings/ubuntu-system-settings-ubuntu-xenial-17

1. ubuntu-system-settings-ubuntu-xenial-17
2. Dependent merge proposals