port New Year changes
GROOVY-5370: ConfigSlurper - multiple environment blocks broken

All credit for the patch and tests to Richard Rattigan
GROOVY-5761 - getBytes for GString
port javadoc improvements for GROOVY-5901