Initial ros-control changes