Adjusted timeout on websocket_test from 3 seconds to 4 in an attempt to reduce
the number of spurious timeouts on jenkins.
Merge branch 'master' of git.curoverse.com:arvados