[Reviewer Ellie] Fix handling of stale CANCEL requests

Ellie

Can you review the fix to handle of late CANCEL requests.  It passes all the existing UTs but I haven't added a new test case for it - but it was pretty obvious this is the problem.  I've also included the fix to the log issue you spotted.

Mike