Merge "Support upload of qcow2.xz image format"