Update ModuleType to have __path__ optionally
#6200
Merged
ModuleType to have __path__ optionally
#6200