[ros-dev] Patch for misc cleanups from Wine