Gui 1043

https://eucalyptus.atlassian.net/browse/GUI-1043