dev/core#1615 Update distmaker to handle the fact civicrm-setup is now in core