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

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