Euca 7952

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