NCBC-1693 Update Tracing to match RFC changes
NCBC-1686 Update timeout messages to use JSON object for context