Merge version 1.185+rpi1 and 1.186 to produce 1.186+rpi1

diff --cc debian/changelog
index a3c84d402d9e7264a167c195fa06b5f5f4589fb8,4407f1a5e362bb16fe3bfedc426ba3921276dc96..4bb089a31998913d626c6d8f1294542dcabf1c3a
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,10 +1,17 @@@
- base-installer (1.185+rpi1) buster-staging; urgency=medium
++base-installer (1.186+rpi1) buster-staging; urgency=medium
 +
 +  [changes brought forward from 1.148+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Wed, 30 Jul 2014 05:27:29 +0000]
 +  * Use raspbian-archive-keyring instead of debian-archive-keyring.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Mon, 31 Dec 2018 09:44:54 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Mon, 25 Feb 2019 12:49:13 +0000
++
+ base-installer (1.186) unstable; urgency=medium
+ 
+   [ Steve McIntyre ]
+   * Make armhf/efi work like armhf/generic for picking kernels
+   * Add myself to uploaders
+ 
+  -- Steve McIntyre <93sam@debian.org>  Mon, 11 Feb 2019 16:16:02 +0000
  
  base-installer (1.185) unstable; urgency=medium
    * Team upload

diff --cc debian/control
Simple merge