Update cloud-generic to deal with xvdb and xvdf weirdness