[ros-diffs] [cgutman] 36918: - Fix a typo - Add one more lock that I forgot - Fix a possible irp double completion