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

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