Prepare move to grails 2.3.9