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

Update cpp-common
Merge remote-tracking branch 'origin/master' into sto639

Conflicts:
	modules/cpp-common
update cpp-common