Merge "Set non-0 disk sizes for tempest flavors"