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

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