Comment 22 for bug 1860456

Hi @mapreri,

I hope you don't mind, but I went ahead and pushed the fixes for this and the other 3 bugs mentioned in my last comment, and uploaded to focal. Of course, please feel free to revert anything I uploaded if you feel it's wrong. Note that for this bug I did use @cjwatson's commit.

I still have more commits in my working branch (e.g. to verify checksums for downloaded binary files) but I didn't push those, only what was needed to fix the bugs.