[ros-diffs] [cfinck] 29153: Fix the intl.cpl build