Groovy 2.1.6

Closes #21378.

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