GUI-1081
Merge pull request #798 from eucalyptus/manifest-fix

GUI-1081