Update for upgrademail.txt template.
Fix for migrated/merged instances (update)