NSX integration fixes

Is the proposal saved later on? It sounds too late to remove nodes from that role.