Groovy 2.2.0

Closes #24460.

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