GROOVY-6598: CliBuilder doesn't respect order when expanding @argsFile args (additional test)
GROOVY-6712: Make GroovyDoc aware of Traits (initial spike)
tweak javadoc (related to GROOVY-5784)
Merge pull request #398 from paulk-asert/groovy6712

GROOVY-6712: Make GroovyDoc aware of Traits (initial spike)
Fix missing super$trait bridge method in case the target class defines a method itself