Add CATALINA_OPTS from pillar