Merge "Exclude tomcat from web starter"