Further refinements for ROS overlay with system ROS

Further refinements for ROS overlay with system ROS.