Merge reason: tracing/core was on a .30-rc1 base and was missing out on
              on a handful of tracing fixes present in .30-rc5-almost.
Signed-off-by: NIngo Molnar <mingo@elte.hu>