Add -Declipse.platform.mergeTrust=true to products

- Remove -Djavax.net.ssl.trustStoreType=Windows-ROOT and
-Djavax.net.ssl.trustStore=NONE

eclipse-platform/eclipse.platform#1690

Author: merks

eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/platform.product

@@ -9,12 +9,15 @@
    <launcherArgs>
       <programArgs>--launcher.defaultAction openFile --launcher.appendVmargs
       </programArgs>
-      <vmArgs>-Dosgi.requiredJavaVersion=21 -Dosgi.dataAreaRequiresExplicitInit=true -Dorg.eclipse.swt.graphics.Resource.reportNonDisposed=true --add-modules=ALL-SYSTEM -Dorg.slf4j.simpleLogger.defaultLogLevel=off
+      <vmArgs>-Dosgi.requiredJavaVersion=21
+-Dosgi.dataAreaRequiresExplicitInit=true
+-Dorg.eclipse.swt.graphics.Resource.reportNonDisposed=true=
+-Dorg.slf4j.simpleLogger.defaultLogLevel=off
+-Declipse.platform.mergeTrust=true
+--add-modules=ALL-SYSTEM
       </vmArgs>
       <vmArgsMac>-Xdock:icon=../Resources/Eclipse.icns -XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts
       </vmArgsMac>
-      <vmArgsWin>-Djavax.net.ssl.trustStoreType=Windows-ROOT -Djavax.net.ssl.trustStore=NONE
-      </vmArgsWin>
    </launcherArgs>
 
    <splash

eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/sdk.product

@@ -9,12 +9,15 @@
    <launcherArgs>
       <programArgs>--launcher.defaultAction openFile --launcher.appendVmargs
       </programArgs>
-      <vmArgs>-Dosgi.requiredJavaVersion=21 -Dosgi.dataAreaRequiresExplicitInit=true -Dorg.eclipse.swt.graphics.Resource.reportNonDisposed=true --add-modules=ALL-SYSTEM -Dorg.slf4j.simpleLogger.defaultLogLevel=off
+      <vmArgs>-Dosgi.requiredJavaVersion=21
+-Dosgi.dataAreaRequiresExplicitInit=true
+-Dorg.eclipse.swt.graphics.Resource.reportNonDisposed=true
+-Dorg.slf4j.simpleLogger.defaultLogLevel=off
+-Declipse.platform.mergeTrust=true
+--add-modules=ALL-SYSTEM
       </vmArgs>
       <vmArgsMac>-Xdock:icon=../Resources/Eclipse.icns -XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts
       </vmArgsMac>
-      <vmArgsWin>-Djavax.net.ssl.trustStoreType=Windows-ROOT -Djavax.net.ssl.trustStore=NONE
-      </vmArgsWin>
    </launcherArgs>
 
    <splash