Prefer Ember.merge over jQuery.extend.
Merge pull request #5304 from rwjblue/remove-usages-of-jquery-extend

Prefer Ember.merge over jQuery.extend.
Allow view to know the original templateHash.
Update container_view_test.js

Updated to use `trim` declared at line 10.
Merge pull request #5305 from quaertym/patch-1

Update container_view_test.js
Silence Ember.Set deprecations in test suite.
Merge pull request #5307 from rwjblue/DAMMIT-SHUT-UP!!

Silence Ember.Set deprecations in test suite.
[BUGFIX beta] Sync router.js, closes #5167
Merge pull request #5308 from machty/router-sync-private-namespace

Sync router.js, closes #5167
Silence Global template lookup deprecations.
Merge pull request #5309 from rwjblue/remove-global-template-deprecations

Silence Global template lookup deprecations.
[BUGFIX beta] controllers w query params are unit testable

Closes #5078
Merge pull request #5311 from machty/unit-test-qp

[BUGFIX beta] controllers w query params are unit testable
[BUGFIX beta] paramsFor: don’t clobber falsy params

Fixes #5275

and other minor cleanup
Merge pull request #5312 from machty/no-clobber-falsy-qp

[BUGFIX beta] paramsFor: don’t clobber falsy params
[Bugfix] missing cache set for non extendable factories
Merge pull request #5313 from emberjs/fix-cache

[Bugfix] missing cache set for non extendable factories
tests for #5313
Merge pull request #5314 from emberjs/tests-for

tests for #5313
Merge pull request #5303 from rwjblue/keep-template-hash-in-view-helper

Allow view to know the original templateHash.