Groovy 2.1.1

Closes #17894.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>