Revert "Tweak test to show that fix for GROOVY-6582 works." because BaseScrpt annotation is not in 1.8

This reverts commit e386b5dca681a2f6b46572e23bc88148e0af978c.
Revert "Add test to show that fix for GROOVY-6582 works.", because BaseScript does not exist in 1.8

This reverts commit fd6d462ff29093822d4581bc69a3f28dd2c89199.
GROOVY-6611: fix compiler problem if generic signature and implements clause of the class mismatch by using only getGenericInterfaces()

Conflicts:

	src/main/org/codehaus/groovy/vmplugin/v5/Java5.java