Upgrade to rest-tool-common 0.4.2