Update cpp_common
Merge pull request #51 from Metaswitch/issue541

Update cpp_common