fix for GRAILS-11229
Merge branch '7.x'

Conflicts:
	TomcatGrailsPlugin.groovy
	grails-app/conf/BuildConfig.groovy
	src/groovy/org/grails/plugins/tomcat/fork/ForkedTomcatServer.groovy