Revert "Trimmed the branch to only the control_msgs sub directory"

This reverts commit 1afe17c660b3d2ed56f0c2b807c383edc9fd620e.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the control_msgs sub directory