[ros-diffs] [tkreuzer] 46972: Recommit rest of ntifs.h and wdm.h from header merge revert