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

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