Plugin upgrades
Added tomcat.*
Merge branch 'master' into m3