NSX integration fixes
Merge pull request #136 from mjura/release/roxy/nsx-integration-fixes

NSX integration fixes