Merge branch 'AM-604/4_0_1' of https://github.com/AutoModality/Onboard-SDK-ROS into AM-604/4_0_1 AM-604/4_0_1

Author: Aaron Roller

src/dji_osdk_ros_obsoleted/modules/dji_sdk_node.cpp

@@ -215,10 +215,10 @@ DJISDKNode::initPublisher(ros::NodeHandle& nh)
 {
   rc_publisher = nh.advertise<sensor_msgs::Joy>("dji_osdk_ros/rc", 10);
 
-  relative_position_publisher = nh.advertise<dji_osdk_ros::RelPosition>("dji_sdk/relative_position", 10);
+  relative_position_publisher = nh.advertise<dji_osdk_ros::RelPosition>("dji_osdk_ros/relative_position", 10);
 
   // device control status, 0=RC, 1=MSDK, 2=OSDK
-  device_status_publisher = nh.advertise<std_msgs::UInt8>("dji_sdk/control_status", 10);
+  device_status_publisher = nh.advertise<std_msgs::UInt8>("dji_osdk_ros/control_status", 10);
 
   attitude_publisher =
     nh.advertise<geometry_msgs::QuaternionStamped>("dji_osdk_ros/attitude", 10);