Euca 7924

https://eucalyptus.atlassian.net/browse/EUCA-7924