[ros-diffs] [fireball] 55077: - Misc trunk headers compatibility fixes.