Various updates and upgrade to Grails 2.3.6