Add in checks to Zip and Tar so that they do not try to include the target file in the archive. PR: 564