Fix up drupal-org-dev.make and rebuild.sh so that HEAD versions of Panopoly code are used