[ros-diffs] [tkreuzer] 50643: Merge resource file related changes from cmake branch part 2