pytest

Change importlib to first try to import modules using the standard mechanism

#11997

Merged