Merge topic 'instrumentation-trace-names' 6929baca2f instrumentation: Fix trace event names Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !11250