Merge proposals dependent on lp://staging/~ps-jenkins/unity-webapps-googledocs/trusty-proposed

1. trusty-proposed
2. Dependent merge proposals