Merge version 9.9+rpi1+deb9u4 and 9.9+deb9u5 to produce 9.9+rpi1+deb9u5

diff --cc debian/changelog
index 51c1a70273c77fc39f42e2e540815ea4d9481310,a52abaf7f316984b22df3989c55f069822a17f08..86dee82cc3a80597b21b3eaf2eb2420b6d42941b
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,8 +1,17 @@@
- base-files (9.9+rpi1+deb9u4) stretch-staging; urgency=medium
++base-files (9.9+rpi1+deb9u5) 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>  Mon, 12 Mar 2018 14:03:57 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sun, 15 Jul 2018 14:15:10 +0000
++
+ base-files (9.9+deb9u5) stretch; urgency=medium
+ 
+   * Change /etc/debian_version to 9.5, for Debian 9.5 point release.
+ 
+  -- Santiago Vila <sanvila@debian.org>  Tue, 26 Jun 2018 14:03:08 +0200
  
  base-files (9.9+deb9u4) stretch; urgency=medium