Upgrade tools4j-config for more consistent config