update tomcat plugin version
Merge branch '2.3.x'

Conflicts:
	apps/kitchen_sink_app/grails-app/conf/BuildConfig.groovy