am 1c5fe40b: am d5a12e80: various fixes for browser test harness

Merge commit '1c5fe40bbea43d4a2d8de74ce169f9f705896f26'

* commit '1c5fe40bbea43d4a2d8de74ce169f9f705896f26':
  various fixes for browser test harness