Consider `controllerName` in Ember.Route#render()

The previously introduced `controllerName` on a route hasn't been
considered when resolving the controller which shall be used within
`Ember.Route#render()`.
Merge branch 'pr/2983' into stable
Merge branch 'stable'