Fix for GRAILS-7170 XSS vulnerability: g:message
doesn't escape message arguments
Merge branch '2.0.x' into 2.1.x
Merge branch '2.1.x' into 2.2.x