Fix issues with [email protected]+

[stefanpenner]

failures:

for ember-beta & ember-canary

• namespace is missing on the ContainerDebugAdapter (needs debugging)

not ok 2 Chrome 92.0 - [2 ms] - Container Debug Adapter Tests: the default ContainerDebugAdapter catalogs controller entries
    ---
        actual: >
            null
        stack: >
            TypeError: Cannot read property 'modulePrefix' of undefined
                at Class.catalogEntriesByType (http://localhost:7357/assets/vendor.js:67503:35)
                at Object.<anonymous> (http://localhost:7357/assets/tests.js:88:45)

• ember polyfils has removed merge

not ok 9 Chrome 92.0 - [0 ms] - ember-resolver/resolvers/classic: can lookup something in another namespace
   ---
       actual: >
           null
       stack: >
           TypeError: (0 , _polyfills.merge) is not a function
               at Object.beforeEach (http://localhost:7357/assets/tests.js:153:54)
       message: >
           beforeEach failed on can lookup something in another namespace: (0 , _polyfills.merge) is not a function
       negative: >
           false
       browser log: |
       

• deprecate is missing a for identifier

[stefanpenner]

I'm going to split out the embroider failures, so we can land this and then I will focus on those.