(maint) Merge up cf3900d to 6.0.x

Generated by CI

* commit 'cf3900d76212d0f5ac8f9aeef679c0eef028cf44':
  (maint) Update puppet to 5c591e9fc732d641b407e3b7390bfe11d4ede66a
  (maint) Update facter to 9a6c865078c882d583891cb1bb6ababab2479c20
  (maint) Update puppet to de124a18d781a07dd123b083428c6053ca65c950
  (PA-2807) Enable Facter jRuby Support for Debian 10
  (PA-2701) Fix DHCP restart on puppet-agent upgrade

configs/components/facter.rb

@@ -48,6 +48,9 @@
   when /(debian-9|ubuntu-(15|16|18))/
     pkg.build_requires 'openjdk-8-jdk'
     java_home = "/usr/lib/jvm/java-8-openjdk-#{platform.architecture}"
+  when /debian-10/
+    pkg.build_requires 'openjdk-11-jdk'
+    java_home = "/usr/lib/jvm/java-11-openjdk-#{platform.architecture}"
   when /sles-12/
     pkg.build_requires 'java-1_7_0-openjdk-devel'
     java_home = "/usr/lib64/jvm/java-1.7.0-openjdk"

resources/windows/wix/filter.xslt.erb

@@ -30,14 +30,4 @@
   <!-- Above directly copies Vanagons default filter.xslt.erb as Vanagon does not provide a
        way to perform additional transforms against heat harvested file list -->
 
-  <!-- (PA-768) Modify puppetres.dll component as permanent -->
-  <xsl:template match="wix:Component[wix:File[@Source='$(var.AppSourcePath)\puppet\bin\puppetres.dll']]">
-    <!-- Copy original component with all attributes, marking "Permanent" -->
-    <xsl:copy>
-      <xsl:apply-templates select="@*" />
-      <xsl:attribute name="Permanent">yes</xsl:attribute>
-      <xsl:apply-templates select="node()" />
-    </xsl:copy>
-  </xsl:template>
-
 </xsl:stylesheet>

resources/windows/wix/registryEntries.wxs.erb

@@ -62,7 +62,7 @@
           <RegistryValue
             Type="string"
             Name="EventMessageFile"
-            Value="[INSTALLDIR]puppet\bin\puppetres.dll"/>
+            Value="%SystemRoot%\System32\EventCreate.exe"/>
           <RegistryValue
             Type="integer"
             Name="TypesSupported"