Correctly export JAVA_OPTS for testing

Change-Id: Iac2eef55145e2008771581e5003e5b21ad7d1c6c
diff --git a/jjb/OnosSystemTest/onos-test-freestyle.yaml b/jjb/OnosSystemTest/onos-test-freestyle.yaml
index 08b6e78..e29d4f4 100644
--- a/jjb/OnosSystemTest/onos-test-freestyle.yaml
+++ b/jjb/OnosSystemTest/onos-test-freestyle.yaml
@@ -343,9 +343,9 @@
                        This parameter is also use to trigger where the test results to be posted
 
       - string:
-         name: 'ONOSJVMHeap'
-         default: "\"${{JAVA_OPTS:--Xms8G -Xmx8G}}\""
-         description: 'onos cell jvm heap size setting'
+         name: 'ONOSJAVAOPTS'
+         default: "\"${{JAVA_OPTS:--Xms8G -Xmx8G -Dkaraf.log.console=INFO -Dds.lock.timeout.milliseconds=10000}}\""
+         description: 'onos cell JAVA_OPTS setting'
 
       - string:
          name: 'TestONBranch'