[ros-diffs] [gadamopoulos] 58779: [thmsvc] - Fix build