base

Merge change 25250 into eclair

* changes:
  Refactor logic for starting forward servers and http test cases hacking, so that they can be shared between automated test mode and UI launch mode.