merge GROOVY-6093 from master
merge GROOVY-6093 from master
GROOVY-6094: Set line/column information for import nodes
GROOVY-6094: Alternate fix that doesn't break external APIs
GROOVY-6094: Make the workaround more "local" to AntlrParserPlugin