Backport groovy-all changes to groovy-1.7 bundle

https://issuetracker.springsource.com/browse/STS-3428