The following need to be backported to 6.10, 6.11 - [x] https://github.com/ember-cli/ember-cli/pull/10932 - [x] https://github.com/ember-cli/ember-cli/pull/10969 - [x] https://github.com/ember-cli/ember-cli/pull/10976
