Fix for GRAILS-9912 Buffer allocation bug in StreamCharBuffer
Merge branch '2.0.x' into 2.1.x
Merge branch '2.1.x' into 2.2.x
Improvement for GRAILS-9912 fix
Merge branch '2.0.x' into 2.1.x
Merge branch '2.1.x' into 2.2.x
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
Merge branch '2.2.x'

Conflicts:
	grails-web/src/main/groovy/org/codehaus/groovy/grails/web/util/StreamCharBuffer.java