Fix handling of stale CANCEL requests
Merge pull request #730 from Metaswitch/sproutlet_cancel_race

[Reviewer Ellie] Fix handling of stale CANCEL requests