switch to catkin branches on volksbot_driver, diffdrive_gazebo_plugin
Merge pull request #6487 from uos/uos-catkin

switch to catkin branches on volksbot_driver, diffdrive_gazebo_plugin