Merge proposals dependent on lp://qastaging/~ps-jenkins/webapps-applications/trusty-proposed

1. trusty-proposed
2. Dependent merge proposals