CFY-847 modified connection_timeout to socket_timeout