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

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