Cherry pick - Fix for a trace bug that was corrupting the trace cache in one replicated pathway

Conflicts:
	test/System/IntegrationTests/IncrementingTraceTests.cs