groovy 2.1.8

Closes #23300.

Signed-off-by: Mike McQuaid <mike@mikemcquaid.com>