Merge version 9.9+rpi1+deb9u6 and 9.9+deb9u7 to produce 9.9+rpi1+deb9u7

diff --cc debian/changelog
index 89824e4ca1d15ee817b50e9dbb4523ab900bf852,463f0cdc7763f6b7b68f094a817a5f28eec14ae4..0713bbcd9e71361a13cdce292e9d2cc62cd857c4
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,8 +1,17 @@@
- base-files (9.9+rpi1+deb9u6) stretch-staging; urgency=medium
++base-files (9.9+rpi1+deb9u7) stretch-staging; urgency=medium
 +
 +  [changes brought forward from 8+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Wed, 07 Jan 2015 02:03:42 +0000]
 +  * Modify default vendor etc for raspbian.
 +  * Modify maintainer scripts so default will be set to raspbian even when
 +    upgrading
 +
-  -- Raspbian forward porter <root@raspbian.org>  Sun, 11 Nov 2018 13:28:45 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 24 Jan 2019 17:00:54 +0000
++
+ base-files (9.9+deb9u7) stretch; urgency=medium
+ 
+   * Change /etc/debian_version to 9.7, for Debian 9.7 point release.
+ 
+  -- Santiago Vila <sanvila@debian.org>  Tue, 22 Jan 2019 14:47:28 +0100
  
  base-files (9.9+deb9u6) stretch; urgency=medium