Add branch ID markers to SAS trails
Use Trail scope rather than Branch scope
Merge pull request #379 from Metaswitch/issue343

[Reviewer: Mike] Add branch ID markers to SAS trails
Fix build warnings
Merge pull request #380 from Metaswitch/build_errors

[No reviewer] Fix build warnings
Integrate SIPResolver in to Bono/Sprout
Pull in latest cpp-common
Merge pull request #381 from Metaswitch/sto622

[Reviewer Matt] Integration of resolver in to Bono and Sprout
Merge branch 'master' of github.com:Metaswitch/sprout into sto643

Conflicts:
	sprout/Makefile