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