NSX integration fixes
Merge pull request #130 from mjura/nsx-integration-fixes

NSX integration fixes