EUCA-7003
Fixed colliding ID attributes in keypair add and import dialogs.
Merge branch 'testing' of github.com:eucalyptus/eucalyptus-console into testing