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

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