Fix Beaker driver not using the default distro variant

Distro variant was overwritten by a value from the image mapping file entry, parsed by a regular expression - but the value of the matching group was still used, even when it's None, effectively overwriting the default.