Added CATALINA_OPTS in templates and instance.pp manifest

This change give the possibility to use also CATALINA_OPTS variable to define some directive of Tomcat.

JAVA_OPTS it's used to start/stop and run Tomcat
CATALINA_OPTS it's used to start/run Tomcat

So it's good to be able to manage both variables, i.e. you could have a really high Xmx to start Tomcat, but to stop it you don't need so much memory in the JVM.

Also, on REDHAT if you set a JMX port in the java_opts the init script will fail in stopping tomcat giving an error such as port XXXX already in use, so in this case you must set this directive in catalina_opts