Merge change 23406 into eclair

* changes:
  allow a longer timeout for layout tests, see if it stabilizes pass/fail numbers