Resolve merge conflict
Merge pull request #315 from Metaswitch/sasapi

[No review required] Resolve merge conflict