Ember.Route#setupController set `this.controller` if defined
Merge pull request #1913 from lcoq/route_setup_set_controller

Ember.Route#setupController set `this.controller` if defined