Merge branch 'release/2.0-RC2'
Merge branch 'release/2.1-RC1'
Added exclusion for Maven -- needed to stop the plugin pulling in the wrong Grails bootstrap version