[ros-diffs] [jimtabor] 60660: - Fix build and fix gcc 4.8.x build issues.