Fix COMMON_TOMCAT setting to match package. Rewrite copy of libraries