Merge pull request #20 from Metaswitch/ralf_sas_work

[Reviewer: Alex] Ralf-specific SAS infrastructure changes
Renumber event IDs
Take latest cpp-common
Fix blank lines
Merge remote-tracking branch 'origin/sas_integration' into ralf_sas_work

Conflicts:
	modules/cpp-common
Point at cpp-common sas-integration
Merge pull request #23 from Metaswitch/ralf_sas_work

[Reviewer: Graeme] SAS events for Ralf
Merge remote-tracking branch 'origin/sas_integration' into ralf_memcached