GUI-1277
moved dialog template
merged develop
GUI-1290
fixed error handling for key generation
merged develop
Merge pull request #981 from eucalyptus/GUI-1290

Gui 1290 fixed error handling for key generation