Merge changes I4e94b8b9,Iae48d489

* changes:
  Support for multiple modules with the same name is going away.
  Support for multiple modules with the same name is going away.