GROOVY-6401: Method return type inference breaks with inheritance

Conflicts:
	src/test/groovy/transform/stc/ClosuresSTCTest.groovy