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

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