[ros-diffs] [amunger] 17439: Merge TimeOut fix from trunk.