Merge version 2.48.2-3+rpi1 and 2.49-1 to produce 2.49-1+rpi1

diff --cc debian/changelog
index 1a7d1428d1b1ae4a2d736809c05d6d90df0c91ef,6a343ed1788bb514353d91bba2e5a6fc44cf12c7..5a74687e9fc3cc318fb411d0432efbb5fea7b151
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,23 +1,32 @@@
- snapd (2.48.2-3+rpi1) bullseye-staging; urgency=medium
++snapd (2.49-1+rpi1) bullseye-staging; urgency=medium
 +
 +  [changes brought forward from 2.27.2-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 24 Aug 2017 17:53:18 +0000]
 +  * Treat unknown derivatives the same as Debian.
 +  * Disable testsuite.
 +  * Fix clean target.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Fri, 05 Feb 2021 06:57:12 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sat, 06 Mar 2021 20:36:56 +0000
++
+ snapd (2.49-1) unstable; urgency=high
+ 
+   * New upstream release with security updates:
+   * SECURITY UPDATE: sandbox escape vulnerability for containers
+     (LP: #1910456)
+     - many: add Delegate=true to generated systemd units for special
+       interfaces
+     - interfaces/greengrass-support: back-port interface changes to
+       2.48
+     - CVE-2020-27352
+   * interfaces/builtin/docker-support: allow /run/containerd/s/...
+     - This is a new path that docker 19.03.14 (with a new version of
+       containerd) uses to avoid containerd CVE issues around the unix
+       socket. See also CVE-2020-15257.
+   * debian/patches/0013-cherry-pick-pr9936.patch:
+     - cherry pick PR#9936 to use all apparmor available (closes: 923500)
+   * d/p/0011-cherry-pick-pr9809, d/p/0012-cherry-pick-pr9844:
+     - dropped, applied upstream
+ 
+  -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 24 Feb 2021 09:23:51 +0100
  
  snapd (2.48.2-3) unstable; urgency=medium