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

Closes #4735
[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
[BUGFIX beta] Convert thrown strings into Ember.Errors
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...
Fix broken build due to unstubbed query params

For Stefan Penner.

/cc @rjackson