NSX integration fixes

Is it possible to move this to the vmware specifc recipe as well?