[ros-diffs] [tkreuzer] 46949: Merge back most changes to ntifs.h from lastt revert