[Reviewer: Jim] Timestamp override

Hi Jim, please can you review this change to allow messages to have their timestamps overridden? I have verified this change with a couple of new UTs.