Fixed EBS image run.
Fixes for: EUCA-9324
Merge branch 'testing' of ssh://git.eucalyptus-systems.com/eucalyptus into testing