Update cpp-common
Merge pull request #622 from Metaswitch/cpp_up

[No reviewer] Update cpp-common