[ros-diffs] [amunger] 23402: Merge 23401 from trunk, fixing ne2000 again.