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

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