GROOVY-6258: groovydoc information loss when using generics
merge from master