[ros-diffs] [rharabien] 51719: [RAPPS] - Merge rapps changes from CMake branch