Groovy 2.1.0

Closes #17453.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
skipfish 2.10

Closes #17449.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>