Groovy 2.3.+

This change updates the version of Groovy used from 2.2.+ to 2.3.+.

[#70736516]
Merge 70736516-groovy-2.3 to master

[Completes #70736516]
Merge remote-tracking branch 'upstream/master'