[ros-diffs] [tkreuzer] 37886: merge rbuild changes 37747, 37778 from trunk