Take new cpp module
Merge pull request #375 from Metaswitch/new_module

[No reviewer] Take new cpp module