Merge pull request #684 from vkosh/master

Remove timeout callback on errors during connect or request.
Clean up more timeouts when shutting down HTTP clients or finishing tests.