[BUGFIX beta] Incorporate latest ember-dev fixes.

Prevents testing of multiple branches unless specifically enabled.
Also, enables features from `features.json` for tests.
Merge pull request #3628 from rjackson/update_ember-dev

[BUGFIX beta] Incorporate latest ember-dev fixes.