Groovy 2.2.0

Closes #24460.

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

[jn: fix patches]

Closes #24464.

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