Clean up get zones to use ec2 rather than service manager
Merge remote-tracking branch 'origin/testing' into testing