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

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