groovy 2.1.7

Closes #22389.

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