Switched control_msgs to ROS distro-specific branches
Merge pull request #3186 from davetcoleman/master

Switched control_msgs to ROS distro-specific branches