fix for EUCA-10005
fix for EUCA-10005
Merge branch 'testing' of git.qa1.eucalyptus-systems.com:qa-repos/eutester into testing