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

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