Merge version 2.1.1-6+rpi1 and 2.1.1-7 to produce 2.1.1-7+rpi1

diff --cc debian/changelog
index a794860180de0c683ea62d1e48dfcc773cdef1dc,1163e027183a4df7ad537958f5681e519657b417..85b9c998839ebf302737328acdca8b0f88551d66
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,12 +1,22 @@@
- openmpi (2.1.1-6+rpi1) buster-staging; urgency=medium
++openmpi (2.1.1-7+rpi1) buster-staging; urgency=medium
 +
++  [changes brought forward from 2.1.1-6+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Wed, 05 Jul 2017 00:52:53 +0000]
 +  * Modify arm "detection" for Raspbian.
 +  * Partially fix clean target
 +  * replace dmb with MCR p15, 0, r0, c7, c10, 5 in opal/asm/base/ARM.asm
 +    as suggested at http://www.open-mpi.org/community/lists/devel/2012/02/10626.php
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Wed, 05 Jul 2017 00:52:53 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Tue, 03 Oct 2017 11:45:15 +0000
++
+ openmpi (2.1.1-7) unstable; urgency=medium
+ 
+   * Standards-Version: 4.1.0; no changes required
+   * Add multistage support to make bootstrappable. Closes: #871243
+   * Typos in package names in rules: openpi -> openmpi. Closes: #876911
+   * Move to debhelper level 10; remove dependencies on automake, 
+     autoconf, autotools-dev, libtool
+ 
+  -- Alastair McKinstry <mckinstry@debian.org>  Wed, 27 Sep 2017 13:33:11 +0100
  
  openmpi (2.1.1-6) unstable; urgency=medium
  

diff --cc debian/rules
Simple merge