Merge proposals dependent on lp://qastaging/~javier.collado/ubuntu-autopilot-tests/open-system-settings

1. open-system-settings
2. Dependent merge proposals