Prefer Ember.assign over Ember.merge

[ghost]

See: http://emberjs.com/blog/2016/04/11/ember-2-5-released.html#toc_code-ember-assign-code

[bendemboski]

Yes please!

[AmilKey]

@rwjblue merge plz

[simonihmig]

👍

[danjamin]

👍

[trianglegrrl]

Whassup with the loader.js test failure? I just created almost exactly the same pull request (maybe exactly the same) and am having the same issue with loader.js.

ENOENT, no such file or directory '/Users/alaina/projects/ember-test-helpers/tmp/funnel-input_base_path-SDCh6fD3.tmp/0/loader.js'
Error: ENOENT, no such file or directory '/Users/alaina/projects/ember-test-helpers/tmp/funnel-input_base_path-SDCh6fD3.tmp/0/loader.js'
    at Error (native)
    at Object.fs.lstatSync (fs.js:792:18)
    at symlink (/Users/alaina/projects/ember-test-helpers/node_modules/broccoli-funnel/node_modules/symlink-or-copy/index.js:60:26)
    at Function.symlinkOrCopySync (/Users/alaina/projects/ember-test-helpers/node_modules/broccoli-funnel/node_modules/symlink-or-copy/index.js:55:5)
    at Funnel._copy (/Users/alaina/projects/ember-test-helpers/node_modules/broccoli-funnel/index.js:394:19)
    at Funnel.processFile (/Users/alaina/projects/ember-test-helpers/node_modules/broccoli-funnel/index.js:377:8)
    at Funnel.applyPatch [as _applyPatch] (/Users/alaina/projects/ember-test-helpers/node_modules/broccoli-funnel/index.js:294:12)
    at Funnel.<anonymous> (/Users/alaina/projects/ember-test-helpers/node_modules/broccoli-funnel/index.js:246:10)
    at Array.forEach (native)
    at Funnel.processFilters (/Users/alaina/projects/ember-test-helpers/node_modules/broccoli-funnel/index.js:245:9)
npm ERR! Test failed.  See above for more details.

[rwjblue]

loader moved its location, and our local build tooling is using the wrong path