An approved embargo/expiry remains in queued jobs even after the page has been archived

[olyism]

Actual steps:

1. Assign a workflow to a page
2. Set desired publishing and expiry date and time
3. Push page into the active workflow
4. Approve the page, workflow is complete
5. Check Queued Jobs, both the embargo and expiry jobs are added
6. Unarchive the page
7. Go back and recheck Queued Jobs, both the embargo and expiry jobs remain

Expected:

• After the page is archived, its embargo and expiry jobs should be removed from queue
• If the archived page was unarchived with the Restore Draft button, prior the set embargo and/or expiry date & time, the desired publish/expiry date & time should be pre-populated with the respective values.

Whilst it's acknowledged that an archived page won't be published when its queued job is run, it would still be cleaner to remove it from the queue.