Updating for jogging-ctrl branch on ros_controllers