groovy 2.1.5

Closes #20710.

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