(IntermittentFailure) Try not adding timeouts directly to a socket connection
Added the  key to the connection info for websockets
Merge branch 'if-push-timeout'

* if-push-timeout:
  Added the  key to the connection info for websockets
  (IntermittentFailure) Try not adding timeouts directly to a socket connection