Updated tomcat plugin and embedded tomcat version