Merge proposals dependent on lp://qastaging/~webapps/webapps-applications/pbuilderjenkins-sitetests

1. pbuilderjenkins-sitetests
2. Dependent merge proposals