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

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