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

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