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

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