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

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