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

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