Update cpp-common and fix warning in main
Merge pull request #106 from Metaswitch/cpp_update

[No reviewer] Update cpp-common and fix warning in main