--keys defaults to false. Fixes EUCA-7903.
Merge branch 'testing' of git.eucalyptus-systems.com:eucalyptus into testing