Merge version 7u211-2.6.17-1~deb8u1+rpi1 and 7u221-2.6.18-1~deb8u1 to produce 7u221...

diff --cc debian/changelog
index 1849b99e63bb79a49302502d7084832502985dc4,e3d9584af7464c5bd3c199b0c8a8c9078fc5fe02..81830562125bc5f496aff2bf8cd5777d103351f7
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,12 +1,21 @@@
- openjdk-7 (7u211-2.6.17-1~deb8u1+rpi1) jessie-staging; urgency=medium
++openjdk-7 (7u221-2.6.18-1~deb8u1+rpi1) jessie-staging; urgency=medium
 +
 +  [changes brought forward from 7u75-2.5.4-3+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sat, 11 Apr 2015 23:21:38 +0000]
 +  * Tag assembler as armv6 to avoid setting off armv7 contamination checker.
 +  * Add patch to disable currency timebomb.
 +  * Allow docs to be built on any architecture.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Thu, 28 Mar 2019 14:57:39 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sat, 11 May 2019 10:20:39 +0000
++
+ openjdk-7 (7u221-2.6.18-1~deb8u1) jessie-security; urgency=medium
+ 
+   * IcedTea release 2.6.18 (based on 7u221).
+   * Security fixes:
+     - S8211936, CVE-2019-2602: Better String parsing
+     - S8218453, CVE-2019-2684: More dynamic RMI interactions
+     - S8219066, CVE-2019-2698: Fuzzing TrueType fonts: setCurrGlyphID()
+ 
+  -- Emilio Pozuelo Monfort <pochu@debian.org>  Thu, 09 May 2019 18:55:46 +0200
  
  openjdk-7 (7u211-2.6.17-1~deb8u1) jessie-security; urgency=medium