REFACTOR: Sync up master with changes for Ember-CLI (PR #11671)

The more parallel the branches, the easier the transition will be.

GitHub

(There will be more commits like this but I’d like to get the branches closer together.)