Take master cpp-common
Merge remote-tracking branch 'origin/dev' into update_cppc
Update cpp-common
Merge pull request #74 from Metaswitch/update_cppc

[No review required] Update cpp-common