Issue #1: sed for drupal version must be done on TRG, not DM_SOURCEDIR
Fix merge conflict.