Update broccoli-funnel and broccoli-merge-trees
Update broccoli-funnel and broccoli-merge-trees

This makes it possible to use recent 4.x versions of ember-source with
ember-engines when using a stricter package manager like Yarn v3, which
otherwise fails because the version ranges are incoompatible.

ember-engines/ember-engines,ember-engines/ember-engines