fix for EUCA-10005
fix for EUCA-10005
fix for EUCA-10005
Merge branch 'euca-10005' of https://github.com/shaon/eutester into shaon-euca-10005

Conflicts:
	eucaops/__init__.py
Merge branch 'shaon-euca-10005' into testing