[Merge] ~callmepk/ubuntu-release-upgrader:ubuntu/focal into ubuntu-release-upgrader:ubuntu/focal

[Brian Murray]

Review: Disapprove

I've gone ahead and merge Didier's change which addressed the same issue in a better way.

https://code.launchpad.net/~ubuntu-core-dev/ubuntu-release-upgrader/+git/ubuntu-release-upgrader/+merge/411011
-- 
https://code.launchpad.net/~callmepk/ubuntu-release-upgrader/+git/ubuntu-release-upgrader/+merge/401850
Your team Ubuntu Core Development Team is subscribed to branch ubuntu-release-upgrader:ubuntu/focal.