fix EBS upload cleanup code
fix EBS upload cleanup code

We cannot delete a volume or security group if they are attached to a running
instance.  This patch waits for confirmed instance termination before attempting
to do either task.  We do this correctly elsewhere in the builder.

jmcabandara/imagefactory,jmcabandara/imagefactory,henrysher/imagefactory,redhat-imaging/imagefactory,redhat-imaging/imagefactory,henrysher/imagefactory,LalatenduMohanty/imagefactory,LalatenduMohanty/imagefactory