Merge proposals dependent on lp://qastaging/~ci-train-bot/unity-control-center/unity-control-center-ubuntu-zesty-2460

1. unity-control-center-ubuntu-zesty-2460
2. Dependent merge proposals