Made two tests less brittle; they assumed that a certain iRODS zone
would be present.
Merge remote-tracking branch 'wtsi-npg/devel' into devel
Merge pull request #296 from keithj/devel

Made two tests less brittle