EUCA-7558: make create-image HA safe
Merge branch 'dev/spark/EUCA-7558-fix' into testing