[Merge] ~slyon/ubuntu-release-upgrader:slyon/focal-python2-fix into ubuntu-release-upgrader:ubuntu/focal

[Lukas Märdian]

Thanks for the review, Brian!

I applied the same patches to the master branch and prepared a MP for it here:

https://code.launchpad.net/~slyon/ubuntu-release-upgrader/+git/ubuntu-release-upgrader/+merge/387577
-- 
https://code.launchpad.net/~slyon/ubuntu-release-upgrader/+git/ubuntu-release-upgrader/+merge/387057
Your team Ubuntu Core Development Team is subscribed to branch ubuntu-release-upgrader:ubuntu/focal.