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

This reverts commit 4386ceb32715e2a9440d27cf35e4af444ce514c4.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the position_controllers sub directory