Don't fuss about multiple ephemerals during instance-run,
but still don't allow multiple ephemerals during register or create image.
Fixes for: EUCA-9148
Merge branch 'testing' of ssh://git.eucalyptus-systems.com/eucalyptus into testing