Merge branch 'jre8' into 'master'

Java JRE8 -> v8.251

See merge request !126

packages/java8-jre.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <packages:packages xmlns:packages="http://www.wpkg.org/packages">
-
-  <package id="java8-jre" name="Java8 Runtime Environment" revision="%version%.2" priority="50" reboot="false">
-    <variable name="version" value="241" />
+  <package id="java8-jre" name="Java8 Runtime Environment" revision="%version%.1" priority="50" reboot="false">
+    <variable name="version" value="261" />
 
     <check type="logical" condition="and">
-      <check type="logical" condition="and">
-        <check type="uninstall" condition="exists" path="Java 8 Update %version% (64-bit)" />
-        <check type="uninstall" condition="exists" path="Java 8 Update %version%" />
-      </check>
+      <check type="uninstall" condition="exists" path="Java 8 Update %version% (64-bit)" />
+      <check type="uninstall" condition="exists" path="Java 8 Update %version%" />
     </check>
 
     <install cmd='taskkill /f /im jqs.exe /im iexplore.exe /im firefox.exe'>
@@ -107,6 +104,10 @@
     <upgrade cmd='msiexec /qn /x {26A24AE4-039D-4CA4-87B4-2F32180211F0}'> <exit code='1603'/> <exit code='1605'/> </upgrade>
     <upgrade cmd='msiexec /qn /x {26A24AE4-039D-4CA4-87B4-2F64180221F0}'> <exit code='1603'/> <exit code='1605'/> </upgrade>
     <upgrade cmd='msiexec /qn /x {26A24AE4-039D-4CA4-87B4-2F32180221F0}'> <exit code='1603'/> <exit code='1605'/> </upgrade>
+    <upgrade cmd='msiexec /qn /x {26A24AE4-039D-4CA4-87B4-2F64180241F0}'> <exit code='1603'/> <exit code='1605'/> </upgrade>
+    <upgrade cmd='msiexec /qn /x {26A24AE4-039D-4CA4-87B4-2F32180241F0}'> <exit code='1603'/> <exit code='1605'/> </upgrade>
+    <upgrade cmd='msiexec /qn /x {26A24AE4-039D-4CA4-87B4-2F64180251F0}'> <exit code='1603'/> <exit code='1605'/> </upgrade>
+    <upgrade cmd='msiexec /qn /x {26A24AE4-039D-4CA4-87B4-2F32180251F0}'> <exit code='1603'/> <exit code='1605'/> </upgrade>
 
     <upgrade cmd='%WPKGSOFTWARE%\java\java8\jre-8u%version%-windows-x64.exe /s WEB_JAVA=1'>
       <exit code='1603'/> <!-- Sigh, we just have to hope this is an "already installed" error -->