Fix YAML load ordering problems. See https://jira.spring.io/browse/SPR-12471
Merge branch 'master' of github.com:grails/grails-core