[ros-diffs] [hyperion] 37202: Merging r37076-r37192 from trunk Basic compilation fixes Regressions :|