Fixes Issue 4479 - Better error message when a module with a name different from its file name is imported via its file name.
Merge pull request #1389 from AndrejMitrovic/Fix4479

Issue 4479 - Better error message with module conflicts