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

This reverts commit 23f8d6bde66cf6de3caa24b3951f7fda80074caa.
Rebase from 'upstream'
Trimmed the branch to only the controller_manager_msgs sub directory