am 28b0e311: am 9d7e75eb: am bf964e6a: Merge change Ic060d86f into eclair

Merge commit '28b0e311959baa55e0c6c9762831165dbafb5046'

* commit '28b0e311959baa55e0c6c9762831165dbafb5046':
  Check whether test server is up before running tests which use streaming files.