INT-2906 Upgrade Groovy to 2.1.0
Merge pull request #746 from garyrussell/INT-2906

* garyrussell-INT-2906:
  INT-2906 Upgrade Groovy to 2.1.0