Merge "Issue #2717 Force use of legacy merge sort" into omaha_14.2.1

Former-commit-id: 54262ad318 [formerly d78dbb85d5 [formerly 566d188782f5976d2a221b5a7ab162da3e8b36ca]]
Former-commit-id: d78dbb85d5
Former-commit-id: c598185130

cave/com.raytheon.viz.product.awips/awips.product

@@ -30,7 +30,8 @@
 -XX:OnOutOfMemoryError="capture -t no -p $pid &"
 -Dlogback.configurationFile=logback-viz-core.xml
 -Dlogback.statusListenerClass=com.raytheon.uf.common.status.logback.UFLogbackInternalStatusListener
--Dthrift.stream.maxsize=200</vmArgs>
+-Dthrift.stream.maxsize=200
+-Djava.util.Arrays.useLegacyMergeSort=true</vmArgs>
       <vmArgsLin>-Xmx1280M</vmArgsLin>
       <vmArgsWin>-Dfile.encoding=UTF-8 -Xmx768M</vmArgsWin>
    </launcherArgs>

edexOsgi/build.edex/esb/conf/wrapper.conf

@@ -93,6 +93,9 @@ wrapper.java.additional.4=-Dorg.apache.camel.jmx.disabled=true
 # Enforces GMT to be used as the timezone
 wrapper.java.additional.5=-Duser.timezone=GMT
 
+# Force Java 7 to use earlier sort algorithm
+wrapper.java.additional.6=-Djava.util.Arrays.useLegacyMergeSort=true
+
 # garbage collection settings
 wrapper.java.additional.gc.1=-XX:+UseConcMarkSweepGC
 wrapper.java.additional.gc.2=-XX:+CMSIncrementalMode