tweak javadoc (related to GROOVY-5784)
GROOVY-6712: Make GroovyDoc aware of Traits (initial spike)
Merge branch 'GROOVY_2_3_0_RC_X' of https://github.com/groovy/groovy-core into GROOVY_2_3_0_RC_X