Don't pass ec2/imaging port/path to imaging vm because they are not longer in use
Merge branch 'testing' of ssh://git.eucalyptus-systems.com/eucalyptus into testing