#1989174 Prevent makefile recursion through per-project properties

Porting patch from https://drupal.org/node/1989174