cpp-common update
Merge pull request #713 from Metaswitch/cpp_update

[No reviewer] Update cpp-common