cpp-common update
Merge pull request #54 from Metaswitch/mod_update

[No reviewer] cpp-common update