Refactor SAS client so it doesn't expose eventq.h header
Fix merge conflict
Merge pull request #33 from Metaswitch/refactor

[Reviewer Alex] Refactor SAS client so it doesn't expose eventq.h header