Merge branch 'testing' of github.com:AppScale/appscale-tools
Merge branch 'testing' of github.com:AppScale/appscale-tools
fixing the ec2 agent to allow the create-image ct test to work
these changes make the zone flag required only if a disk flag is also present
Removing zone from required arguments for run_instances
Merge pull request #294 from briandrawert/fix-zone-info-as-optional-param

Fix to make zone an optional parameter