Merge "Change extra_size from hardcoded 1 to CONF.volume.volume_size_extend"