Merge version 2.51.7-1+rpi1 and 2.51.7-2 to produce 2.51.7-2+rpi1

diff --cc debian/changelog
index 4174ab61a8a05ff3d11a63b2a42cd7c8d61ce248,e7b840d11baa3bd2581c6cf8977188ac3915b5f1..2324675d06e5452a72b68f4537b1735ad859721f
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,13 +1,22 @@@
- snapd (2.51.7-1+rpi1) bookworm-staging; urgency=medium
++snapd (2.51.7-2+rpi1) bookworm-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>  Mon, 06 Sep 2021 20:24:55 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Wed, 22 Sep 2021 15:00:20 +0000
++
+ snapd (2.51.7-2) unstable; urgency=medium
+ 
+   * debian: cherry-pick PR#10745
+     - cherry pick https://github.com/snapcore/snapd/pull/10745
+       (closes: #993783)
+   * debian/control:
+     - build with go-1.15 for now until snapd-2.52 is released
+       which fully supports go.mod
+ 
+  -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 07 Sep 2021 13:53:22 +0200
  
  snapd (2.51.7-1) unstable; urgency=medium
  

diff --cc debian/rules
Simple merge