PUBLIC - IDE

Improve tomcat support (CATALINA_HOME != CATALINA_BASE)