Merged latest changes from jlink.groovy-core