Merge topic 'export-diagnostic-context'

a557231285 Exports: Capture context for diagnostics

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !12166