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

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