[ros-diffs] [weiden] 16444: fix gcc4 warnings and indention