Fix for GRAILS-9988
keep application.config and application.flatConfig in sync when Config.groovy changes
Merge branch '2.0.x' into 2.1.x
Merge branch '2.1.x' into 2.2.x