Merge proposals dependent on lp://staging/~ps-jenkins/indicator-display/ubuntu-vivid-proposed

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