[ros-diffs] [hbirr] 18737: Revert r18735 and add the missing definition to svcctl.idl.