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

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