start adapting the new trait support to the Grails 3 code base