[ros-diffs] [tkreuzer] 46489: [CMPBATT] reduce diff to trunk