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

CLC-1538 Apply new JVM settings for trinidad