Distinguish between server-sent and client-sent basic.cancels.
Merged bug25677 into stable
stable to default (someone forgot)