Make recursion work with our makefile

The fact that makefiles are parsed bottom-up, means all overrides need to be at the top of our own makefile, and Panopoly with its sub-projects needs to be at the bottom of our own makefile.

Original Post

[edit:] Please ignore!

Trying to fix #1988570: FAPE causing "Illegal string offset 'field_name'" cost me hours of failure.
Currently I'm trying to track down the Drush bug #1621030: Regression for recursive makefiles. which still prevents us from overriding dependencies in panopoly_core.make

It would be really nice if you could apply the patch on a git checkout of openatrium and run Drush make.

What to do?

git clone --branch 7.x-2.x http://git.drupal.org/project/openatrium.git
cd openatrium
wget http://drupal.org/files/drush-oa2-concurrency-issue.patch
git apply drush-oa2-concurrency-issue.patch
./build.sh ../foo

How to tell?
It is expected that FAPE is checked out and correctly patched by openatrium.make, and later checked out again but not patched by panopoly_core.make.

You can tell either from the log output or from taking a look at ../foo/sites/all/modules/contrib/fape/fape.module. If the last function in the file is named:
function _fape_extract_entity_from_context($pane, $context)
then the file has been correctly patched. Otherwise it was overwritten.

Please also supply the drush version.
Whoever finds some time might play around with this and that, of course.
Thank you!

(I'm marking this a major task because there will again and again be dependencies that we want to patch.)

[edit:] Please ignore the patch, too!