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

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