Use "channel" naming consistently throughout.
Wordsmith.
Initialize opt_errno to avoid incorrectly detecting an error from getsockopt.
Merge remote-tracking branch 'upstream/master'

* upstream/master:
  Initialize opt_errno to avoid incorrectly detecting an error from getsockopt.
  Wordsmith.
  Use "channel" naming consistently throughout.