FOOD-1: Implement final version of drush make. Updated patches