Update cpp-common and change S comparison
Merge pull request #595 from Metaswitch/cpp_update

[No reviewer] Update cpp-common and change S comparison