EUCA-7699: delete EMI when create-image task fails
Merge branch 'dev/spark/EUCA-7699' into testing