Update cpp-common
Merge pull request #579 from Metaswitch/issue541

Update cpp-common