cpp-common update
Merge pull request #98 from Metaswitch/cpp_update

[No reviewer]  cpp-common update
Merge remote-tracking branch 'origin/dev' into rf_acct_id

Conflicts:
	modules/cpp-common
Update cpp-common