Process cancellation for waiters on rpc client close
Process cancellation for waiters on rpc server close
Merge branch 'master' into stream