Merge proposals dependent on lp://qastaging/~ps-jenkins/ubuntu-settings-components/ubuntu-vivid-proposed

1. ubuntu-vivid-proposed
2. Dependent merge proposals