More changes to add groovy22 to the build.