Fix for Tomcat version issue and concat dep