[ros-diffs] [fireball] 54739: - Misc trunk 547xx-compatibility fixes.