Groovy 2.2.+

This change updates the version of Groovy to 2.2.+.

[#60962286]
Merge 60962286-groovy-22 to master

[Completes #60962286]