formatting and removed force parameter which is not needed in the reconnect solution
Merge remote-tracking branch 'origin/master' into reconnect
reconnection and client channels