Pull in latest cpp-common with alarm changes