Fixes issue 15039: namespace packages are no longer imported in preference to modules of the same name.
