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

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