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

This reverts commit 0548a50ce2330f5a72d2a715002ad1ad93718599.
Rebase from 'upstream'
Trimmed the branch to only the position_controllers sub directory