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

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