Do not corrupt state on server-sent basic.cancel.
Minimise distance from stable
Merged bug25691 into stable