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

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