Change azone to zone in volume ops
Merge remote-tracking branch 'origin/testing' into testing

Conflicts:
	eucaops/ec2ops.py
Merge branch 'testing' of github.com:eucalyptus/eutester into testing