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

This reverts commit 72a557c8667c33ce1b8c72e4e35c752fa423ec57.
Rebase from 'upstream'
Trimmed the branch to only the controller_manager sub directory