------------------
* Change format of connection arguments to be a single dict called
``connection_kwargs`` rather than individual options, as they change by
connection type. You will need to change your settings if you have any of
socket_connect_timeout, socket_timeout, socket_keepalive or
socket_keepalive_options set to move them into a ``connection_kwargs`` dict.