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

This reverts commit 82ed2a8a2e9c25e08b42a43489ae175061166d55.
Rebase from 'upstream'
Trimmed the branch to only the controller_manager sub directory