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

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