Call Diversion AS
Simservs UT
Add docs
Code review mark-ups
Merge origin/dev into sto985
Merge pull request #836 from Metaswitch/sto985

[Reviewer: Andy] Call Diversion AS