When the concept of "modules as categories" was implemented, it broke inclusion of ExternalAppModules in two places. (cherry picked from commit 98cf5ba4)