bug 1036658 - shorten test timeout unless on CI
Merge pull request #1559 from zombie/1036658-short-timeout

bug 1036658 - shorten test timeout unless on CI, r=@Mossop