ProtocolChannelClient now has a timeout when connecting to the server - this needs to take into account delays waiting for user input

If the user is being prompted for user input we need to take this into account when handling the actual connection timeout.

Should the timeout occur while the user is entering their details we should continue to wait, we should also take into account the time they stopped entering their input so the timeout is not exhausted as soon as they press enter.

(We already have a CallbackHandler for this purpose - just need to re-instate it now)