[Bugfix beta] [Fixes #4396] Controller#model is external API

The content property is now for downstream consumption
and should merely be an alias of model.
Merge pull request #4725 from emberjs/model-content-consistency

[Bugfix beta] [Fixes #4396] Controller#model is primary, content is now ...