GRAILS-9880 fixed wrong property name
GRAILS-9923 removed use of withDefault
added error handling for malformed tokens
fix for GRAILS-9898 "can't reload i18n messages in run-app"
Merge branch '2.1.x' into 2.2.x