[FEATURE query-params-new] Fix model inheritance for qps

Closes #4735
[DOC Beta] New behaviour with itemController

This [BUGFIX beta - Ensure context is unchanged when using keywords with itemController.](https://github.com/emberjs/ember.js/pull/4636) changed the way `itemController` behaves inside `#each` helper. I had problems making it work out because documentation doesn't clear this out and I had to debug it.

These two JsBins describe what changed from the developer using `#each` helper with `itemController`.

- [JsBin with Ember (1.5.1)](http://jsbin.com/ucanam/4838/edit) -> we can call itemController's property without prepending `person`

- [JsBin with Ember (1.6.0-beta.3)](http://jsbin.com/ucanam/4837/edit) -> if we don't prepend `person` for itemController's property we won't get result
Merge pull request #4802 from zigomir/patch-2

[DOC Beta] New behaviour with itemController
[BUGFIX beta] Don't fire redirect on parent routes

We've decided this is just going to be merged
into beta, not release.

Closes #4692
Fix small code styling inconsistencies with CONTRIBUTING.md
Fix issue with Travis using 2.1.0.
Merge pull request #4809 from dentuzhik/fix-styling

Fix small code styling inconsistencies with CONTRIBUTING.md
More Travis shenanigans.
[DOC Beta] Fixing documentation typo (thanks to @bmac)
Merge pull request #4796 from machty/parent-redirect

[BUGFIX release] Don't fire redirect on parent routes
Merge pull request #4812 from duereg/master

Convert thrown strings into Ember.Errors
[Bugfix beta] [Fixes #4396] Controller#model is external API

The content property is now for downstream consumption
and should merely be an alias of model.
[bugfix beta] [fixes #4342] ensure controllers instantiated by the render helper are torn down
[BUGFIX] Fix wrong view keyword in a component block

Close #3520

Signed-off-by: Kris Selden <kris.selden@gmail.com>
[query-params-new] Fix failure when using QP array values
Merge pull request #4528 from andrei1089/fix_qp_array_values

[query-params-new] Fix failure when using QP array values
Merge pull request #4795 from machty/qp-inherit

[FEATURE query-params-new] Fix model inheritance for qps
[BUGFIX beta] Fix various issues related to ES6 import correctness.

* Remove duplicate imports.
* Ensure that modules do not declare variables with names matching local imports.

These things are currently allowed by the es6-module-transpiler but not by the ES6 spec.
Merge pull request #4725 from emberjs/model-content-consistency

[Bugfix beta] [Fixes #4396] Controller#model is primary, content is now ...
Merge pull request #4742 from stefanpenner/fix-render-with-extra-context-leak

[bugfix beta] [fixes #4342] ensure controllers instantiated by the rende...