More changes from CATALINA_HOME to CATALINA_BASE to support multi-instance installations