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

This reverts commit 3a91e0c0f95f0216efae5f84f94944ab3a470341.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the controller_manager sub directory