Cleanup deprecations from Controller content -> model change.

A few deprecations were being thrown in the test suite after merging https://github.com/emberjs/ember.js/pull/4857, this cleans them up.