[Merge] ~ubuntu-support-team/software-properties:devel into software-properties:ubuntu/master

[Dan Streetman]

@juliank, I see you may have commented on something, but as LP doesn't break out individual commits to comment on (like github does), I just can't find what comment you left in the gigantic diff.  Could you comment up here?  Or I can open a MR in salsa since that does have per-commit comments, maybe that would be easier.
-- 
https://code.launchpad.net/~ubuntu-support-team/software-properties/+git/software-properties/+merge/379928
Your team Ubuntu Core Development Team is requested to review the proposed merge of ~ubuntu-support-team/software-properties:devel into software-properties:ubuntu/master.