Update cpp-common
Merge pull request #648 from Metaswitch/cpp_update

[No reviewer] Update cpp-common