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

1. unity-control-center-ubuntu-yakkety-2463
2. Dependent merge proposals