Bump broccoli-merge-trees from 3.0.2 to 4.1.0 (#6925)

Bumps [broccoli-merge-trees](https://github.com/broccolijs/broccoli-merge-trees) from 3.0.2 to 4.1.0.
- [Release notes](https://github.com/broccolijs/broccoli-merge-trees/releases)
- [Changelog](https://github.com/broccolijs/broccoli-merge-trees/blob/master/CHANGELOG.md)
- [Commits](broccolijs/broccoli-merge-trees@v3.0.2...v4.1.0)

Signed-off-by: dependabot-preview[bot] <[email protected]>

Author: dependabot-preview[bot]

packages/-ember-data/package.json

@@ -32,7 +32,7 @@
     "@ember/edition-utils": "^1.2.0",
     "@ember/ordered-set": "^2.0.3",
     "@glimmer/env": "^0.1.7",
-    "broccoli-merge-trees": "^3.0.2",
+    "broccoli-merge-trees": "^4.1.0",
     "ember-cli-babel": "^7.13.2",
     "ember-cli-typescript": "^3.1.2",
     "ember-inflector": "^3.0.1"

packages/private-build-infra/package.json

@@ -23,7 +23,7 @@
     "broccoli-debug": "^0.6.5",
     "broccoli-file-creator": "^2.1.1",
     "broccoli-funnel": "^2.0.2",
-    "broccoli-merge-trees": "^3.0.2",
+    "broccoli-merge-trees": "^4.1.0",
     "broccoli-rollup": "^4.1.1",
     "calculate-cache-key-for-tree": "^2.0.0",
     "chalk": "^3.0.0",

yarn.lock

@@ -3981,6 +3981,14 @@ broccoli-merge-trees@^3.0.0, broccoli-merge-trees@^3.0.1, broccoli-merge-trees@^
     broccoli-plugin "^1.3.0"
     merge-trees "^2.0.0"
 
+broccoli-merge-trees@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.npmjs.org/broccoli-merge-trees/-/broccoli-merge-trees-4.1.0.tgz#a30e2e4c5bb0f5eb8981e8af33a8077714c11f1a"
+  integrity sha512-1OXsksKPFiRdiZZOfh1z1mm7ZqKezlMS+DPBpHMDLSb6AhYHvoQfjf0KuMXbY8aoYskj7+Z+EJ5SsS/OC2v5yw==
+  dependencies:
+    broccoli-plugin "^3.1.0"
+    merge-trees "^2.0.0"
+
 broccoli-middleware@^2.1.0:
   version "2.1.1"
   resolved "https://registry.npmjs.org/broccoli-middleware/-/broccoli-middleware-2.1.1.tgz#183635bbef4dc1241533ee001a162f013d776cb9"
@@ -4101,7 +4109,7 @@ broccoli-plugin@^2.0.0, broccoli-plugin@^2.1.0:
     rimraf "^2.3.4"
     symlink-or-copy "^1.1.8"
 
-broccoli-plugin@^3.0.0:
+broccoli-plugin@^3.0.0, broccoli-plugin@^3.1.0:
   version "3.1.0"
   resolved "https://registry.npmjs.org/broccoli-plugin/-/broccoli-plugin-3.1.0.tgz#54ba6dd90a42ec3db5624063292610e326b1e542"
   integrity sha512-7w7FP8WJYjLvb0eaw27LO678TGGaom++49O1VYIuzjhXjK5kn2+AMlDm7CaUFw4F7CLGoVQeZ84d8gICMJa4lA==