Merge branch 'testing' of github.com:eucalyptus/eucalyptus-console into testing
Merge branch 'testing' of github.com:eucalyptus/eucalyptus-console into testing
EUCA-7753
added amazonimage set into special image hash calculation conditional