Fixed an issue where tests were not restoring correctly because teststatus.ionc was including common.inc instead of common_lib.inc which would wipe out a bunch of variables if it was included in the middle of a function.
Changed the archive restore code to not copy the zip file to tmp if we are restoring from local disk
Merge pull request #321 from gburiola/master

Several updates to locations.ini.EC2-sample