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

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