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

diff --cc debian/changelog
index 1caeaa7dd5ff9059919b48913908967723f4c996,cc0a01b87ee71a3fd2b7e1f238baed4d6bdc674e..388c814f9e37a575460287042295341ac7d0e47a
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,10 +1,17 @@@
- ostree (2018.5-1+rpi1) buster-staging; urgency=medium
++ostree (2018.5-2+rpi1) buster-staging; urgency=medium
 +
 +  [changes brought forward from 2017.11-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 28 Sep 2017 16:17:06 +0000]
 +  * Disable testsuite.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Sun, 20 May 2018 21:16:19 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Wed, 20 Jun 2018 20:43:35 +0000
++
+ ostree (2018.5-2) unstable; urgency=medium
+ 
+   * d/tests/gnome-desktop-testing: Skip libostree/test-concurrency.py.test
+     during autopkgtest. It does not appear to be completely reliable.
+     (See #901170)
+ 
+  -- Simon McVittie <smcv@debian.org>  Sun, 10 Jun 2018 13:57:19 +0100
  
  ostree (2018.5-1) unstable; urgency=medium