[ros-diffs] [cgutman] 41460: - Make CancelId a LONG