Merge version 7u151-2.6.11-2~deb8u1+rpi1 and 7u171-2.6.13-1~deb8u1 to produce 7u171...

diff --cc debian/changelog
index 4029812d9a19e41418336f536a9f8091441eb249,11be47016dc2a06a2691308817c81988f19a3520..e268ebf118d446b6c3118cbea605659426ddf190
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,4 +1,13 @@@
- openjdk-7 (7u151-2.6.11-2~deb8u1+rpi1) jessie-staging; urgency=medium
++openjdk-7 (7u171-2.6.13-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.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Sun, 03 Dec 2017 13:53:39 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 05 Apr 2018 00:49:38 +0000
 +
- openjdk-7 (7u151-2.6.11-2~deb8u1) jessie-security; urgency=medium
+ openjdk-7 (7u171-2.6.13-1~deb8u1) jessie-security; urgency=medium
  
    * Rebuild for jessie-security
  

diff --cc debian/rules
Simple merge