Fixup the scrape code to better handle absolute paths to local (on source server) images and files.
Resolve merge conflict in gen_redirect.drush.inc.