clean metaclass changes in AbstractGrailsTagTests tearDown
Merge branch '2.3.x' into 2.4.x
Merge branch '2.4.x' into 2.5.x
Merge branch '2.5.x'

Conflicts:
	grails-test-suite-base/src/main/groovy/org/grails/web/taglib/AbstractGrailsTagTests.groovy