Merge change 6983

* changes:
  Include the full stacktrace when a test times out.