Merge proposals dependent on lp:~jdstrand/ubuntu-system-settings/ubuntu-system-settings-lp1296415

1. ubuntu-system-settings-lp1296415
2. Dependent merge proposals