CLC-1538 Apply new JVM settings for trinidad
Merge pull request #894 from ctweney/clc-1538-qa

CLC-1538 Apply new JVM settings for trinidad