Handle I-CSCF retries and S-CSCF default handling correctly
Code review feedback
Merge pull request #726 from Metaswitch/asliveness

[Reviewer Andy] Handle I-CSCF retries and S-CSCF default handling correctly