[wip] NSX integration fixes

We don't need anything from this part including files below.