Fix bug breaking live tests
Merge pull request #776 from Metaswitch/issue436

[Reviewer Andy] Fix bug in Timer C support breaking live tests