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

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