This PR also removes conn_bug_21133 workaround which is not valid anymore, all we need is deadline connection with server in place Fixes #7503