EUCA-7846
took block device mappings into account for instance and image hash calculation
Merge pull request #153 from eucalyptus/EUCA-7846

EUCA-7846