Merge "delete_on_termination added for VM with cinder volume in 2 tests"