Allow multiple original-package tags.

Also fix some issues with moving files from update commands.
3 files changed