Fix for using Mothership system images with the wrong domain. We used to
handle this, but I lost it in the recent image cleanup. Note that this will need adjusting if/when we decide to make system images non global (and thus require a credential).
Showing with 13 additions and 4 deletions