OFC-1266 - In collect-assembly move tomcat distribution into "tomcat"
subfolder