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

1. webapps-applications-sitetests
2. Dependent merge proposals