Allow event timestamps to be overriden
Tweak testcase name
Do not allow timestamps on markers to be overriden
Merge pull request #42 from Metaswitch/timestamp_override

[Reviewer: Jim] Timestamp override