Allow artifacts to be downloaded without being unzipped

Also move the skzipunzip check followed by Stop to the UpgradeCommand()