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

This reverts commit 556d9c90d1209d6f9773fb2e1e5bd71119336a86.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the effort_controllers sub directory