Issue #6074: Apply an appropriate fix for importlib based imports
4 files changed