Fix negotiator crash when using CCB to connect to startds. #3801
Merge branch 'V8_0-branch'