cleanup volumes in terminated state
change condition check in eachVolumeAttachment
Merge branch 'dev/spark/EUCA-6127' into testing