[Merge] ~the-meulengracht/ubuntu/+source/snapd:changelogs-2.61 into ubuntu/+source/snapd:ubuntu/devel

[Dan Bungert]

Hi Philip, thanks for the MP.

There are now a very large number of merge conflicts, so I think this MP needs re-review.  Removing Ubuntu Sponsors at the moment.
-- 
https://code.launchpad.net/~the-meulengracht/ubuntu/+source/snapd/+git/snapd/+merge/453545
Your team Ubuntu Sponsors is requested to review the proposed merge of ~the-meulengracht/ubuntu/+source/snapd:changelogs-2.61 into ubuntu/+source/snapd:ubuntu/devel.