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

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