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

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