Merge "Fix for bug917490 * Adds a wait for the image to become active before deleting it"