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

This reverts commit c9e9e7f3d7ca74377535f0897fe81b3b71282289.
Rebase from 'upstream'
Trimmed the branch to only the controller_manager sub directory