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

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