GROOVY-5459: grape command and help is wrong command line structure
GROOVY-6725: XML parsing error during grape uninstall
Merge branch 'GROOVY_2_3_0_RC_X' of https://github.com/groovy/groovy-core into GROOVY_2_3_0_RC_X