Small change to the logic introduced in #839
Add an additional timeout so the user has a convenient way of controlling distinct connect and command timeouts