webapps-demo

Merge proposals dependent on lp://qastaging/~elopio/webapps-demo/fix_autopilot_tests

  1. fix_autopilot_tests
  2. Dependent merge proposals

lp://qastaging/~elopio/webapps-demo/fix_autopilot_tests has no merge proposals.