[ros-diffs] [mbosma] 25326: Two more formating and debug output changes from cc branch.