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

This reverts commit 51cbdd3c2ad95603d74038d39dbb98c51be23e23.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the controller_manager sub directory