[fixes #58876266] Fix cancelled cherrypicking requests
Merge pull request #819 from JamesGlover/58876266_recycling_of_cherrypick_requests_is_broken

[fixes #58876266] Fix cancelled cherrypicking requests