fix up ephemeral labels

Change-Id: I3413772d296ce62ae71a346b4460257ed2b96ac8
fix up get_all_vdi_uuids_for_vm

Change-Id: I5b18479beeb253dba208e8e95668403ec2fcdbc0