[ros-diffs] [hyperion] 36875: Bring rosapps up to date with the rbuild changes of r36870