XNAT-3328: Updating to latest groovy libraries and dependencies.
Merged changes from earlier out-of-sync changeset back into default branch.