Merge pull request #5194 from rwjblue/revert-ember-routing-consistent-resources

[FEATURE ember-routing-consistent-resources] Revert feature.
Allow Router DSL to nest routes.