[ros-diffs] [cgutman] 45356: - Merge some small changes from aicom-network-branch to fix potential memory corruption and remove unused code in oskittcp - Add a hack to WSHSetSocketInformation so we don't fail with options that aren't implemented yet - Fixes bug #5131