Manual merge of version 7u151-2.6.11-1~deb8u1+rpi1 and 7u151-2.6.11-2~deb8u1 to produ...

diff --cc debian/changelog
index a493c770391ce2d1f29f0180464485a25fade236,9e675236914ea091fef740673a5f12064bb36896..4029812d9a19e41418336f536a9f8091441eb249
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,4 +1,13 @@@
- openjdk-7 (7u151-2.6.11-1~deb8u1+rpi1) jessie-staging; urgency=medium
++openjdk-7 (7u151-2.6.11-2~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>  Sun, 03 Sep 2017 23:13:01 +0000
++ -- Peter Michael Green <plugwash@raspbian.org>  Sun, 03 Dec 2017 13:53:39 +0000
 +
- openjdk-7 (7u151-2.6.11-1~deb8u1) jessie-security; urgency=medium
+ openjdk-7 (7u151-2.6.11-2~deb8u1) jessie-security; urgency=medium
  
    * Rebuild for jessie-security
  

diff --cc debian/rules
index a7bff9665389f6ca6db24787bde5b51eeac81476,35e472731cfa43d2af825b6a63c50e02fd967d51..e3b345d9dd75ef7bdd46479fe683b29730bac647
--- 1/debian/rules
--- 2/debian/rules
+++ b/debian/rules
@@@ -302,7 -305,7 +305,8 @@@ DISTRIBUTION_PATCHES += 
        debian/patches/nonreparenting-wm.diff \
        debian/patches/accessible-toolkit.patch \
        debian/patches/fix_extra_flags-$(hotspot_version).diff \
-       debian/patches/tag-asm-as-armv6.diff
++      debian/patches/tag-asm-as-armv6.diff \
+       debian/patches/hotspot-aarch64-S8150652-unused-template.diff \
  
  ifeq ($(with_bridge),atk)
      DISTRIBUTION_PATCHES += \