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

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