Cherry pick fixes for NSX on icehouse
[james-page,r=gnuoy] Cherry pick fixes for NSX on icehouse