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

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