Disable the timeout of some tests in SocketEchoTest to find out why it is hanging in CI
Merge remote-tracking branch upstream/$:{upbranch}