minor refactor: remove some unused imports and expand some * imports (expansion was just where optimize imports made such a change for files having unused imports)

Conflicts:
	src/main/org/codehaus/groovy/antlr/java/Java2GroovyProcessor.java
	src/main/org/codehaus/groovy/transform/stc/GroovyTypeCheckingExtensionSupport.java
merge tweak