Fix timeout configuration for 2.2.x

See #1739 for the fix on master

Note, this will silently swallow some misconfiguration errors.  Let me know if you think that's a notable issue. 

I tried to keep changes to a minimum to avoid divergence from master, but introducing the clientConfig method made testing the changes much simpler.

I have previously signed the CLA.