[ros-diffs] [hbelusca] 65660: Partial merge of condrv_restructure branch r65657.