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

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