Manually fix mismerges from r261399
Add initial multiqueue support to vmx(4)

Since we seem to blacklist MSI-X support on VMware, the tunable
hw.pci.honor_msi_blacklist must be set to 0 before the driver
will attempt to use multiple queues.