Fix IPv6 when using transports from bono's connection pool to sprout
Poll bono and sprout using poll-sip
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
Merge pull request #381 from Metaswitch/sto622

[Reviewer Matt] Integration of resolver in to Bono and Sprout
Do correct comparison of scscf names
Remove debug comments
Merge pull request #383 from Metaswitch/iss382

[Reviewer: Mike] Iss382
Update pjsip module
Break up msg body
Merge pull request #385 from Metaswitch/iss384

[Reviewer: Mike] Update pjsip module
Merge pull request #378 from Metaswitch/monit-poll

[Reviewer: Mike] Poll bono and sprout using poll-sip
Update to cpp-common
Merge pull request #386 from Metaswitch/submodule_update

[No reviewer] Update to cpp-common
Merge pull request #377 from Metaswitch/ipv6_transport_fix

[Reviewer: Mike] Fix IPv6 when using transports from bono's connection pool to sprout
Fix SIP polling
Merge branch 'poll-sip' into dev