[ros-diffs] [chorns] 17027: Fix building 'make test'