[wip] NSX integration fixes

Are you sure we don't need the metering agent?