Merge remote-tracking branch 'samwhited/sslsocket_workaround'

Status Job ID Name Coverage
  Test
passed #7143
docker
test

00:00:42