PMO-2627: grails upgrade