First checkin
Merge branch 'master' of github.com:Metaswitch/sprout into iss403

Conflicts:
	sprout/icscfproxy.cpp
Git issues
Updates to cpp-common
Merge pull request #437 from Metaswitch/submodule

[No reviewer] Updates to cpp-common
Update UTs
Update UTs
Merge pull request #438 from Metaswitch/iss403

[No reviewer] Iss403
Merge branch 'master' of github.com:Metaswitch/sprout into sto536
Remove unnecessary check for capabilities
Update comment in UT
Fix indent and comment
Merge pull request #439 from Metaswitch/iss434

[Reviewer: Mike] Remove extra check for capabilities
Merge branch 'master' of github.com:Metaswitch/sprout into sto536