[ros-diffs] [hbirr] 15776: Copied 15422 from trunk. There was an mixed case filename conflict.