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

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