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

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