Additional fixes for NSX

Do not use ML2.

Also add missing handling of vmware in some ```case```. I'm not 100% sure this part is correct, though.