Added CATALINA_OPTS in templates and instance.pp manifest