fix for GRAILS-9490 "Cannot use Java String with '${}' in Config.groovy"
Merge branch '2.1.x' of github.com:grails/grails-core into 2.1.x
Merge branch '2.1.x' into 2.2.x