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

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