Add line numbers automatically if available
Merge pull request #66 from Metaswitch/line-numbers-in-logs

Reviewer Mike - Add line numbers automatically if available
Fix user initiated de-registration
Merge pull request #67 from Metaswitch/user_init_dereg

[Reviewer Andy] Fix user initiated de-registration
Fix up expected log to be less strict
Tidy up coverage
Merge pull request #68 from Metaswitch/log-format-ut-fix

Reviewer Matt - Log format UT fix