cpp-common update
Merge pull request #64 from Metaswitch/cpp_up

[No reviewer] cpp-common update