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

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