Two low-hanging fruits from the Jenkins patch set

These two are the easiest hopefully non-controversial changes.

The first change drastically improves the unit test execution speed from Ant (which you probably don't use but I couldn't build this with Maven nor Gradle.)

The second change enhances `JsonGroovyBuilder` a bit.