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

[No reviewer] cpp-common update