Fixes #6444 - add support for virtual NICs

Rather than checking self.virtual? here, shouldn't `uniq_fields_with_hosts` change its return value depending on `self.virtual?`?