Pull in right version of cpp-common