take master cpp-common
Merge pull request #95 from Metaswitch/update_cppc

Take master cpp-common