INT-2906 Upgrade Groovy to 2.1.0