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

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