Fixes EUCA-9180.
Merge branch 'testing' of git.eucalyptus-systems.com:eucalyptus into testing