Update cpp-common
Merge pull request #601 from Metaswitch/iss572

[No reviewer] Update cpp-common