Change AbstractChannel#doDeregister return type from Runnable to void.
Merge remote-tracking branch upstream/$:{upbranch}