Merging ros_control_gazebo and gazebo_ros_control