HCOLL-240 now setting clientChannel to NULL on close
Merge remote-tracking branch 'origin/master'