GRAILS-9674 Reapply Jeff fixes to upgrade Spring to 3.2.0.RELEASE