[ros-diffs] [greatlrd] 22587: Copy trunk rev 22585 to new branches/powerpc