Avoid parent's implicit index route clobbering child's explicit index.

Fixes emberjs/ember.js#2318.
Merge pull request #2337 from viki-org/explicit-index

Avoid parent's implicit index route clobbering child's explicit index.