Merge "lib/tempest: Do not rely on six for image_size_in_gib"