[ros-diffs] [dgoette] 37915: * code cleanup * some bugfixes