Merge branch '4158-ctrl-c-hanging-in-error-logging' into '1.11.x'

Related to #4158

Fix Ctrl-C hanging in error logging

See merge request !6042 (merged)

There was no inhibition of SIGINT handler in 1.11.x, but the traceback capture could still hang