Merge proposals dependent on lp://qastaging/~vrruiz/webapps-applications/fix-1180485

lp://qastaging/~vrruiz/webapps-applications/fix-1180485 has no merge proposals.