manually merging in patch for roswtf ROS_ROOT ending check from ros_comm.