Merge pull request #3887 from rjackson/update_ember-dev

[BUGFIX beta] Ensure that each branch is bundled before building.
[DOC beta] Clarify context of a component's block.