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

This reverts commit 7e4cfbe3a93f6be55ab91c04101c37d5adc52962.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the controller_manager sub directory